From cd29877650599cbe0089d213d49e4d1cd253ab36 Mon Sep 17 00:00:00 2001 From: Armin Wehrfritz Date: Wed, 15 Jun 2016 18:33:20 +0300 Subject: [PATCH 1/5] Add XDMF_TOPOLOGY_TYPE_POLYHEDRON to Xdmf.f adjust values to correspond to XdmfFortran.hpp --- utils/Xdmf.f | 53 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/utils/Xdmf.f b/utils/Xdmf.f index 007c6dae..22d1f651 100644 --- a/utils/Xdmf.f +++ b/utils/Xdmf.f @@ -144,32 +144,33 @@ parameter (XDMF_TOPOLOGY_TYPE_POLYVERTEX = 500) parameter (XDMF_TOPOLOGY_TYPE_POLYLINE = 501) parameter (XDMF_TOPOLOGY_TYPE_POLYGON = 502) - parameter (XDMF_TOPOLOGY_TYPE_TRIANGLE = 503) - parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL = 504) - parameter (XDMF_TOPOLOGY_TYPE_TETRAHEDRON = 505) - parameter (XDMF_TOPOLOGY_TYPE_PYRAMID = 506) - parameter (XDMF_TOPOLOGY_TYPE_WEDGE = 507) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON = 508) - parameter (XDMF_TOPOLOGY_TYPE_EDGE_3 = 509) - parameter (XDMF_TOPOLOGY_TYPE_TRIANGLE_6 = 510) - parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL_8 = 511) - parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL_9 = 512) - parameter (XDMF_TOPOLOGY_TYPE_TETRAHEDRON_10 = 513) - parameter (XDMF_TOPOLOGY_TYPE_PYRAMID_13 = 514) - parameter (XDMF_TOPOLOGY_TYPE_WEDGE_15 = 515) - parameter (XDMF_TOPOLOGY_TYPE_WEDGE_18 = 516) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_20 = 517) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_24 = 518) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_27 = 519) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_64 = 520) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_125 = 521) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_216 = 522) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_343 = 523) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_512 = 524) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_729 = 525) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1000 = 526) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1331 = 527) - parameter (XDMF_TOPOLOGY_TYPE_MIXED = 528) + parameter (XDMF_TOPOLOGY_TYPE_POLYHEDRON = 503) + parameter (XDMF_TOPOLOGY_TYPE_TRIANGLE = 504) + parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL = 505) + parameter (XDMF_TOPOLOGY_TYPE_TETRAHEDRON = 506) + parameter (XDMF_TOPOLOGY_TYPE_PYRAMID = 507) + parameter (XDMF_TOPOLOGY_TYPE_WEDGE = 508) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON = 509) + parameter (XDMF_TOPOLOGY_TYPE_EDGE_3 = 510) + parameter (XDMF_TOPOLOGY_TYPE_TRIANGLE_6 = 511) + parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL_8 = 512) + parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL_9 = 513) + parameter (XDMF_TOPOLOGY_TYPE_TETRAHEDRON_10 = 514) + parameter (XDMF_TOPOLOGY_TYPE_PYRAMID_13 = 515) + parameter (XDMF_TOPOLOGY_TYPE_WEDGE_15 = 516) + parameter (XDMF_TOPOLOGY_TYPE_WEDGE_18 = 517) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_20 = 518) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_24 = 519) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_27 = 520) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_64 = 521) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_125 = 522) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_216 = 523) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_343 = 524) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_512 = 525) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_729 = 526) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1000 = 527) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1331 = 528) + parameter (XDMF_TOPOLOGY_TYPE_MIXED = 529) parameter (XDMF_SET_TYPE_NODE = 601) parameter (XDMF_SET_TYPE_CELL = 602) -- GitLab From 701cffdee2955e829e71c0971979db5b1474f50e Mon Sep 17 00:00:00 2001 From: Armin Wehrfritz Date: Wed, 15 Jun 2016 18:46:23 +0300 Subject: [PATCH 2/5] Add missing XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_* definition to Xdmf.f --- utils/Xdmf.f | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/utils/Xdmf.f b/utils/Xdmf.f index 22d1f651..40533aea 100644 --- a/utils/Xdmf.f +++ b/utils/Xdmf.f @@ -88,6 +88,14 @@ integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON_729 integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1000 integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1331 + integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_64 + integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_125 + integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_216 + integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_343 + integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_512 + integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_729 + integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_1000 + integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_1331 integer XDMF_TOPOLOGY_TYPE_MIXED ! Set Type -- GitLab From 9fd8c2990e0661a5b90cc05c4f3d667f1486ef64 Mon Sep 17 00:00:00 2001 From: Armin Wehrfritz Date: Wed, 15 Jun 2016 18:38:35 +0300 Subject: [PATCH 3/5] Add missing XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_* to Xdmf.f --- utils/Xdmf.f | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/utils/Xdmf.f b/utils/Xdmf.f index 40533aea..4a79607e 100644 --- a/utils/Xdmf.f +++ b/utils/Xdmf.f @@ -178,7 +178,15 @@ parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_729 = 526) parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1000 = 527) parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1331 = 528) - parameter (XDMF_TOPOLOGY_TYPE_MIXED = 529) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_64 = 529) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_125 = 530) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_216 = 531) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_343 = 532) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_512 = 533) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_729 = 534) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_1000 = 535) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_1331 = 536) + parameter (XDMF_TOPOLOGY_TYPE_MIXED = 537) parameter (XDMF_SET_TYPE_NODE = 601) parameter (XDMF_SET_TYPE_CELL = 602) -- GitLab From 201a5850bee3d43c131e7104380ad06a0766f451 Mon Sep 17 00:00:00 2001 From: Armin Wehrfritz Date: Wed, 15 Jun 2016 18:42:29 +0300 Subject: [PATCH 4/5] Whitespace --- utils/Xdmf.f | 58 ++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/utils/Xdmf.f b/utils/Xdmf.f index 4a79607e..c390489f 100644 --- a/utils/Xdmf.f +++ b/utils/Xdmf.f @@ -149,35 +149,35 @@ parameter (XDMF_GRID_COLLECTION_TYPE_SPATIAL = 400) parameter (XDMF_GRID_COLLECTION_TYPE_TEMPORAL = 401) - parameter (XDMF_TOPOLOGY_TYPE_POLYVERTEX = 500) - parameter (XDMF_TOPOLOGY_TYPE_POLYLINE = 501) - parameter (XDMF_TOPOLOGY_TYPE_POLYGON = 502) - parameter (XDMF_TOPOLOGY_TYPE_POLYHEDRON = 503) - parameter (XDMF_TOPOLOGY_TYPE_TRIANGLE = 504) - parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL = 505) - parameter (XDMF_TOPOLOGY_TYPE_TETRAHEDRON = 506) - parameter (XDMF_TOPOLOGY_TYPE_PYRAMID = 507) - parameter (XDMF_TOPOLOGY_TYPE_WEDGE = 508) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON = 509) - parameter (XDMF_TOPOLOGY_TYPE_EDGE_3 = 510) - parameter (XDMF_TOPOLOGY_TYPE_TRIANGLE_6 = 511) - parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL_8 = 512) - parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL_9 = 513) - parameter (XDMF_TOPOLOGY_TYPE_TETRAHEDRON_10 = 514) - parameter (XDMF_TOPOLOGY_TYPE_PYRAMID_13 = 515) - parameter (XDMF_TOPOLOGY_TYPE_WEDGE_15 = 516) - parameter (XDMF_TOPOLOGY_TYPE_WEDGE_18 = 517) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_20 = 518) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_24 = 519) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_27 = 520) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_64 = 521) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_125 = 522) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_216 = 523) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_343 = 524) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_512 = 525) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_729 = 526) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1000 = 527) - parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1331 = 528) + parameter (XDMF_TOPOLOGY_TYPE_POLYVERTEX = 500) + parameter (XDMF_TOPOLOGY_TYPE_POLYLINE = 501) + parameter (XDMF_TOPOLOGY_TYPE_POLYGON = 502) + parameter (XDMF_TOPOLOGY_TYPE_POLYHEDRON = 503) + parameter (XDMF_TOPOLOGY_TYPE_TRIANGLE = 504) + parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL = 505) + parameter (XDMF_TOPOLOGY_TYPE_TETRAHEDRON = 506) + parameter (XDMF_TOPOLOGY_TYPE_PYRAMID = 507) + parameter (XDMF_TOPOLOGY_TYPE_WEDGE = 508) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON = 509) + parameter (XDMF_TOPOLOGY_TYPE_EDGE_3 = 510) + parameter (XDMF_TOPOLOGY_TYPE_TRIANGLE_6 = 511) + parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL_8 = 512) + parameter (XDMF_TOPOLOGY_TYPE_QUADRILATERAL_9 = 513) + parameter (XDMF_TOPOLOGY_TYPE_TETRAHEDRON_10 = 514) + parameter (XDMF_TOPOLOGY_TYPE_PYRAMID_13 = 515) + parameter (XDMF_TOPOLOGY_TYPE_WEDGE_15 = 516) + parameter (XDMF_TOPOLOGY_TYPE_WEDGE_18 = 517) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_20 = 518) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_24 = 519) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_27 = 520) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_64 = 521) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_125 = 522) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_216 = 523) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_343 = 524) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_512 = 525) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_729 = 526) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1000 = 527) + parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_1331 = 528) parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_64 = 529) parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_125 = 530) parameter (XDMF_TOPOLOGY_TYPE_HEXAHEDRON_SPECTRAL_216 = 531) -- GitLab From 791ddfdbcce8361ffa42035e51ea7e47685dbb8e Mon Sep 17 00:00:00 2001 From: Armin Wehrfritz Date: Wed, 15 Jun 2016 18:46:57 +0300 Subject: [PATCH 5/5] Style --- utils/Xdmf.f | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/Xdmf.f b/utils/Xdmf.f index c390489f..508a7620 100644 --- a/utils/Xdmf.f +++ b/utils/Xdmf.f @@ -62,13 +62,13 @@ integer XDMF_TOPOLOGY_TYPE_POLYVERTEX integer XDMF_TOPOLOGY_TYPE_POLYLINE integer XDMF_TOPOLOGY_TYPE_POLYGON + integer XDMF_TOPOLOGY_TYPE_POLYHEDRON integer XDMF_TOPOLOGY_TYPE_TRIANGLE integer XDMF_TOPOLOGY_TYPE_QUADRILATERAL integer XDMF_TOPOLOGY_TYPE_TETRAHEDRON integer XDMF_TOPOLOGY_TYPE_PYRAMID integer XDMF_TOPOLOGY_TYPE_WEDGE integer XDMF_TOPOLOGY_TYPE_HEXAHEDRON - integer XDMF_TOPOLOGY_TYPE_POLYHEDRON integer XDMF_TOPOLOGY_TYPE_EDGE_3 integer XDMF_TOPOLOGY_TYPE_TRIANGLE_6 integer XDMF_TOPOLOGY_TYPE_QUADRILATERAL_8 -- GitLab