From 14fb7a363294f9cb9a062da597d020e457b99faa Mon Sep 17 00:00:00 2001 From: Jacqueline Austermann Date: Tue, 9 May 2017 10:42:59 -0400 Subject: [PATCH] updated dynamic topography tests to also test lower surface DT --- tests/dynamic_topography.prm | 1 + .../bottom_dynamic_topography.00000 | 9 ++ .../dynamic_topography.00000 | 2 +- tests/dynamic_topography2.prm | 1 + .../bottom_dynamic_topography.00000 | 9 ++ .../dynamic_topography.00000 | 2 +- tests/dynamic_topography3.prm | 1 + .../bottom_dynamic_topography.00000 | 49 ++++++++++ .../dynamic_topography.00000 | 98 +++++++++---------- tests/dynamic_topography_back.prm | 1 + .../bottom_dynamic_topography.00000 | 9 ++ .../dynamic_topography.00000 | 2 +- 12 files changed, 132 insertions(+), 52 deletions(-) create mode 100644 tests/dynamic_topography/bottom_dynamic_topography.00000 create mode 100644 tests/dynamic_topography2/bottom_dynamic_topography.00000 create mode 100644 tests/dynamic_topography3/bottom_dynamic_topography.00000 create mode 100644 tests/dynamic_topography_back/bottom_dynamic_topography.00000 diff --git a/tests/dynamic_topography.prm b/tests/dynamic_topography.prm index e26073d46f3..3d7a6303d84 100644 --- a/tests/dynamic_topography.prm +++ b/tests/dynamic_topography.prm @@ -111,6 +111,7 @@ subsection Postprocess subsection Dynamic Topography set Subtract mean of dynamic topography = true + set Output lower surface topography = true end subsection Visualization diff --git a/tests/dynamic_topography/bottom_dynamic_topography.00000 b/tests/dynamic_topography/bottom_dynamic_topography.00000 new file mode 100644 index 00000000000..445899d782e --- /dev/null +++ b/tests/dynamic_topography/bottom_dynamic_topography.00000 @@ -0,0 +1,9 @@ +# x y lower surface topography +112500 0 -20.3092 +337500 0 -23.6647 +562500 0 -17.0188 +787500 0 60.9927 +1.0125e+06 0 60.9927 +1.2375e+06 0 -17.0188 +1.4625e+06 0 -23.6647 +1.6875e+06 0 -20.3092 diff --git a/tests/dynamic_topography/dynamic_topography.00000 b/tests/dynamic_topography/dynamic_topography.00000 index 35d90f704c1..098acaf1c53 100644 --- a/tests/dynamic_topography/dynamic_topography.00000 +++ b/tests/dynamic_topography/dynamic_topography.00000 @@ -1,4 +1,4 @@ -# x y topography +# x y upper surface topography 112500 700000 -40.1439 337500 700000 -42.7954 562500 700000 -12.0079 diff --git a/tests/dynamic_topography2.prm b/tests/dynamic_topography2.prm index a3b22bb3b8f..f7ef6d16ef0 100644 --- a/tests/dynamic_topography2.prm +++ b/tests/dynamic_topography2.prm @@ -112,6 +112,7 @@ subsection Postprocess subsection Dynamic Topography set Subtract mean of dynamic topography = true + set Output lower surface topography = true end subsection Visualization diff --git a/tests/dynamic_topography2/bottom_dynamic_topography.00000 b/tests/dynamic_topography2/bottom_dynamic_topography.00000 new file mode 100644 index 00000000000..1525a1c9ad3 --- /dev/null +++ b/tests/dynamic_topography2/bottom_dynamic_topography.00000 @@ -0,0 +1,9 @@ +# x y lower surface topography +112500 0 -0.732672 +337500 0 -0.44762 +562500 0 0.230153 +787500 0 0.950139 +1.0125e+06 0 0.950139 +1.2375e+06 0 0.230153 +1.4625e+06 0 -0.44762 +1.6875e+06 0 -0.732672 diff --git a/tests/dynamic_topography2/dynamic_topography.00000 b/tests/dynamic_topography2/dynamic_topography.00000 index 636f1598c87..d789238a0ab 100644 --- a/tests/dynamic_topography2/dynamic_topography.00000 +++ b/tests/dynamic_topography2/dynamic_topography.00000 @@ -1,4 +1,4 @@ -# x y topography +# x y upper surface topography 112500 700000 -74.5541 337500 700000 -63.7343 562500 700000 -114.61 diff --git a/tests/dynamic_topography3.prm b/tests/dynamic_topography3.prm index 0209063be4a..08aaed62558 100644 --- a/tests/dynamic_topography3.prm +++ b/tests/dynamic_topography3.prm @@ -78,6 +78,7 @@ subsection Postprocess subsection Dynamic Topography set Subtract mean of dynamic topography = true + set Output lower surface topography = true end subsection Visualization diff --git a/tests/dynamic_topography3/bottom_dynamic_topography.00000 b/tests/dynamic_topography3/bottom_dynamic_topography.00000 new file mode 100644 index 00000000000..2f7f5d1407b --- /dev/null +++ b/tests/dynamic_topography3/bottom_dynamic_topography.00000 @@ -0,0 +1,49 @@ +# x y z lower surface topography +-1.18078e+06 -3.03043e+06 0 277.759 +-2.1729e+06 -2.1729e+06 1.06789e+06 -219.302 +-2.1729e+06 -2.1729e+06 -1.06789e+06 -219.301 +-3.03043e+06 -1.18078e+06 0 277.765 +-2.1729e+06 -1.06789e+06 2.1729e+06 -221.564 +-1.18078e+06 0 3.03043e+06 167.64 +-3.03043e+06 0 1.18078e+06 363.145 +-2.1729e+06 1.06789e+06 2.1729e+06 -221.512 +0 -3.03043e+06 1.18078e+06 165.986 +1.06789e+06 -2.1729e+06 2.1729e+06 -300.999 +-1.06789e+06 -2.1729e+06 2.1729e+06 -300.982 +0 -1.18078e+06 3.03043e+06 185.957 +2.1729e+06 -2.1729e+06 -1.06789e+06 -247.314 +1.18078e+06 -3.03043e+06 0 151.995 +2.1729e+06 -2.1729e+06 1.06789e+06 -247.327 +2.1729e+06 -1.06789e+06 2.1729e+06 -193.516 +1.18078e+06 0 3.03043e+06 293.451 +0 1.18078e+06 3.03043e+06 311.69 +-1.06789e+06 2.1729e+06 2.1729e+06 -272.998 +-1.18078e+06 0 -3.03043e+06 185.956 +-2.1729e+06 -1.06789e+06 -2.1729e+06 -300.978 +1.06789e+06 -2.1729e+06 -2.1729e+06 -221.507 +0 -3.03043e+06 -1.18078e+06 363.147 +0 -1.18078e+06 -3.03043e+06 167.639 +-1.06789e+06 -2.1729e+06 -2.1729e+06 -221.569 +3.03043e+06 -1.18078e+06 0 327.365 +3.03043e+06 0 1.18078e+06 313.513 +2.1729e+06 1.06789e+06 2.1729e+06 -193.491 +1.06789e+06 2.1729e+06 2.1729e+06 -273.061 +0 3.03043e+06 1.18078e+06 116.411 +3.03043e+06 1.18078e+06 0 201.596 +2.1729e+06 2.1729e+06 -1.06789e+06 -275.298 +2.1729e+06 2.1729e+06 1.06789e+06 -275.296 +1.18078e+06 3.03043e+06 0 201.59 +2.1729e+06 -1.06789e+06 -2.1729e+06 -273.003 +1.18078e+06 0 -3.03043e+06 311.691 +3.03043e+06 0 -1.18078e+06 116.411 +2.1729e+06 1.06789e+06 -2.1729e+06 -273.056 +0 1.18078e+06 -3.03043e+06 293.451 +-1.06789e+06 2.1729e+06 -2.1729e+06 -193.513 +1.06789e+06 2.1729e+06 -2.1729e+06 -193.495 +0 3.03043e+06 -1.18078e+06 313.511 +-2.1729e+06 2.1729e+06 -1.06789e+06 -247.327 +-3.03043e+06 1.18078e+06 0 151.988 +-1.18078e+06 3.03043e+06 0 327.371 +-2.1729e+06 2.1729e+06 1.06789e+06 -247.315 +-2.1729e+06 1.06789e+06 -2.1729e+06 -301.004 +-3.03043e+06 0 -1.18078e+06 165.986 diff --git a/tests/dynamic_topography3/dynamic_topography.00000 b/tests/dynamic_topography3/dynamic_topography.00000 index 11d19ba86f2..d8d200c8c0c 100644 --- a/tests/dynamic_topography3/dynamic_topography.00000 +++ b/tests/dynamic_topography3/dynamic_topography.00000 @@ -1,49 +1,49 @@ -# x y z topography --2.14984e+06 -5.51748e+06 0 -79.8508 --3.95618e+06 -3.95618e+06 1.94431e+06 -18.4103 --3.95618e+06 -3.95618e+06 -1.94431e+06 -18.4194 --5.51748e+06 -2.14984e+06 0 -79.8477 --3.95618e+06 -1.94431e+06 3.95618e+06 42.5317 --2.14984e+06 -1.74623e-10 5.51748e+06 68.4837 --5.51748e+06 -1.74623e-10 2.14984e+06 -102.341 --3.95618e+06 1.94431e+06 3.95618e+06 42.5006 -0 -5.51748e+06 2.14984e+06 2.25892 -1.94431e+06 -3.95618e+06 3.95618e+06 68.1133 --1.94431e+06 -3.95618e+06 3.95618e+06 68.0799 -0 -2.14984e+06 5.51748e+06 12.5402 -3.95618e+06 -3.95618e+06 -1.94431e+06 30.7026 -5.51748e+06 -2.14984e+06 -1.74623e-10 -120.398 -2.14984e+06 -5.51748e+06 -1.74623e-10 60.7563 -3.95618e+06 -3.95618e+06 1.94431e+06 30.7344 -5.51748e+06 0 2.14984e+06 -61.7428 -3.95618e+06 1.94431e+06 3.95618e+06 -6.68416 -3.95618e+06 -1.94431e+06 3.95618e+06 -6.66008 -2.14984e+06 0 5.51748e+06 -72.2071 -1.94431e+06 3.95618e+06 3.95618e+06 19.059 -1.74623e-10 5.51748e+06 2.14984e+06 42.719 -1.74623e-10 2.14984e+06 5.51748e+06 -127.95 --1.94431e+06 3.95618e+06 3.95618e+06 19.0238 -5.51748e+06 2.14984e+06 0 20.2136 -3.95618e+06 3.95618e+06 -1.94431e+06 79.8304 -3.95618e+06 3.95618e+06 1.94431e+06 79.8225 -2.14984e+06 5.51748e+06 0 20.2079 -3.95618e+06 -1.94431e+06 -3.95618e+06 19.0278 -2.14984e+06 -1.74623e-10 -5.51748e+06 -127.964 -5.51748e+06 -1.74623e-10 -2.14984e+06 42.7354 -3.95618e+06 1.94431e+06 -3.95618e+06 19.0573 -0 2.14984e+06 -5.51748e+06 -72.2207 --1.94431e+06 3.95618e+06 -3.95618e+06 -6.65417 -1.94431e+06 3.95618e+06 -3.95618e+06 -6.69022 -0 5.51748e+06 -2.14984e+06 -61.7289 --3.95618e+06 3.95618e+06 -1.94431e+06 30.7334 --5.51748e+06 2.14984e+06 -1.74623e-10 60.7492 --2.14984e+06 5.51748e+06 -1.74623e-10 -120.395 --3.95618e+06 3.95618e+06 1.94431e+06 30.7004 --2.14984e+06 0 -5.51748e+06 12.5566 --3.95618e+06 -1.94431e+06 -3.95618e+06 68.0847 --3.95618e+06 1.94431e+06 -3.95618e+06 68.1095 --5.51748e+06 0 -2.14984e+06 2.24302 -1.94431e+06 -3.95618e+06 -3.95618e+06 42.4985 -1.74623e-10 -5.51748e+06 -2.14984e+06 -102.356 -1.74623e-10 -2.14984e+06 -5.51748e+06 68.4991 --1.94431e+06 -3.95618e+06 -3.95618e+06 42.533 +# x y z upper surface topography +-2.14984e+06 -5.51748e+06 0 -79.8449 +-3.95618e+06 -3.95618e+06 1.94431e+06 -18.4153 +-3.95618e+06 -3.95618e+06 -1.94431e+06 -18.4158 +-5.51748e+06 -2.14984e+06 0 -79.8567 +-3.95618e+06 -1.94431e+06 3.95618e+06 42.5321 +-2.14984e+06 -1.74623e-10 5.51748e+06 68.4859 +-5.51748e+06 -1.74623e-10 2.14984e+06 -102.343 +-3.95618e+06 1.94431e+06 3.95618e+06 42.5007 +0 -5.51748e+06 2.14984e+06 2.24697 +1.94431e+06 -3.95618e+06 3.95618e+06 68.1114 +-1.94431e+06 -3.95618e+06 3.95618e+06 68.0826 +0 -2.14984e+06 5.51748e+06 12.551 +3.95618e+06 -3.95618e+06 -1.94431e+06 30.704 +2.14984e+06 -5.51748e+06 -1.74623e-10 60.7464 +3.95618e+06 -3.95618e+06 1.94431e+06 30.7318 +3.95618e+06 -1.94431e+06 3.95618e+06 -6.65475 +2.14984e+06 0 5.51748e+06 -72.2099 +1.74623e-10 2.14984e+06 5.51748e+06 -127.962 +-1.94431e+06 3.95618e+06 3.95618e+06 19.0232 +1.94431e+06 -3.95618e+06 -3.95618e+06 42.4973 +1.74623e-10 -5.51748e+06 -2.14984e+06 -102.346 +1.74623e-10 -2.14984e+06 -5.51748e+06 68.4875 +-1.94431e+06 -3.95618e+06 -3.95618e+06 42.535 +5.51748e+06 -2.14984e+06 -1.74623e-10 -120.391 +5.51748e+06 0 2.14984e+06 -61.7418 +3.95618e+06 1.94431e+06 3.95618e+06 -6.68941 +1.94431e+06 3.95618e+06 3.95618e+06 19.0618 +1.74623e-10 5.51748e+06 2.14984e+06 42.7314 +5.51748e+06 2.14984e+06 0 20.2051 +3.95618e+06 3.95618e+06 -1.94431e+06 79.8288 +3.95618e+06 3.95618e+06 1.94431e+06 79.8272 +2.14984e+06 5.51748e+06 0 20.2173 +3.95618e+06 -1.94431e+06 -3.95618e+06 19.0271 +2.14984e+06 -1.74623e-10 -5.51748e+06 -127.963 +5.51748e+06 -1.74623e-10 -2.14984e+06 42.7324 +3.95618e+06 1.94431e+06 -3.95618e+06 19.0584 +0 2.14984e+06 -5.51748e+06 -72.2114 +-1.94431e+06 3.95618e+06 -3.95618e+06 -6.65708 +1.94431e+06 3.95618e+06 -3.95618e+06 -6.68613 +0 5.51748e+06 -2.14984e+06 -61.7395 +-3.95618e+06 3.95618e+06 -1.94431e+06 30.7326 +-5.51748e+06 2.14984e+06 -1.74623e-10 60.7597 +-2.14984e+06 5.51748e+06 -1.74623e-10 -120.403 +-3.95618e+06 3.95618e+06 1.94431e+06 30.705 +-2.14984e+06 0 -5.51748e+06 12.5526 +-3.95618e+06 -1.94431e+06 -3.95618e+06 68.0794 +-3.95618e+06 1.94431e+06 -3.95618e+06 68.1149 +-5.51748e+06 0 -2.14984e+06 2.24619 diff --git a/tests/dynamic_topography_back.prm b/tests/dynamic_topography_back.prm index e490b0b6ae5..7df99677e66 100644 --- a/tests/dynamic_topography_back.prm +++ b/tests/dynamic_topography_back.prm @@ -111,6 +111,7 @@ subsection Postprocess subsection Dynamic Topography set Subtract mean of dynamic topography = true + set Output lower surface topography = true end subsection Visualization diff --git a/tests/dynamic_topography_back/bottom_dynamic_topography.00000 b/tests/dynamic_topography_back/bottom_dynamic_topography.00000 new file mode 100644 index 00000000000..445899d782e --- /dev/null +++ b/tests/dynamic_topography_back/bottom_dynamic_topography.00000 @@ -0,0 +1,9 @@ +# x y lower surface topography +112500 0 -20.3092 +337500 0 -23.6647 +562500 0 -17.0188 +787500 0 60.9927 +1.0125e+06 0 60.9927 +1.2375e+06 0 -17.0188 +1.4625e+06 0 -23.6647 +1.6875e+06 0 -20.3092 diff --git a/tests/dynamic_topography_back/dynamic_topography.00000 b/tests/dynamic_topography_back/dynamic_topography.00000 index 35d90f704c1..098acaf1c53 100644 --- a/tests/dynamic_topography_back/dynamic_topography.00000 +++ b/tests/dynamic_topography_back/dynamic_topography.00000 @@ -1,4 +1,4 @@ -# x y topography +# x y upper surface topography 112500 700000 -40.1439 337500 700000 -42.7954 562500 700000 -12.0079