Fix field name and output filename

geodynamics · Mar 18, 2024 · b71e0c4 · b71e0c4
1 parent 77117b4
commit b71e0c4
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 44 deletions.
diff --git a/source/postprocess/dynamic_topography.cc b/source/postprocess/dynamic_topography.cc
@@ -425,7 +425,7 @@ namespace aspect
         {
           output << "# "
                  << ((dim==2)? "x y " : "x y z ")
-                 << " heat_flux_" << boundary_name << std::endl;
+                 << "dynamic_topography_" << boundary_name << std::endl;
         }
 
       for (unsigned int i=0; i<stored_values.size(); ++i)

diff --git a/source/postprocess/heat_flux_map.cc b/source/postprocess/heat_flux_map.cc
@@ -466,7 +466,10 @@ namespace aspect
             this->get_geometry_model().translate_id_to_symbol_name(boundary_id) == "bottom")
           output_to_file(boundary_id, heat_flux_and_area);
 
-      const std::string placeholder_name = this->get_output_directory() + "heat_flux." + Utilities::int_to_string(this->get_timestep_number(), 5);
+      std::string placeholder_name = this->get_output_directory() + "heat_flux." + Utilities::int_to_string(this->get_timestep_number(), 5);
+      if (this->get_parameters().run_postprocessors_on_nonlinear_iterations)
+        placeholder_name.append("." + Utilities::int_to_string (this->get_nonlinear_iteration(), 4));
+
       return std::pair<std::string,std::string>("Writing heat flux map",
                                                 placeholder_name);
     }

diff --git a/tests/dynamic_topography/dynamic_topography_bottom.00000 b/tests/dynamic_topography/dynamic_topography_bottom.00000
@@ -1,9 +1,9 @@
-# x y bottom topography
-112500 0 -20.35932195
-337500 0 -22.5880606
-562500 0 -13.12252722
-787500 0 55.68976695
-1012500 0 55.68976696
-1237500 0 -13.12252721
-1462500 0 -22.58806058
-1687500 0 -20.35932193
+# x y dynamic_topography_bottom
+112500 0 -20.35932198
+337500 0 -22.58806059
+562500 0 -13.12252715
+787500 0 55.68976686
+1012500 0 55.68976686
+1237500 0 -13.12252713
+1462500 0 -22.58806056
+1687500 0 -20.35932195
diff --git a/tests/dynamic_topography2/dynamic_topography_bottom.00000 b/tests/dynamic_topography2/dynamic_topography_bottom.00000
@@ -1,4 +1,4 @@
-# x y bottom topography
+# x y dynamic_topography_bottom
 112500 0 -0.691340274
 337500 0 -0.4081226042
 562500 0 0.2240167169

diff --git a/tests/dynamic_topography3/dynamic_topography_bottom.00000 b/tests/dynamic_topography3/dynamic_topography_bottom.00000
@@ -1,4 +1,4 @@
-# x y z bottom topography
+# x y z dynamic_topography_bottom
 -1265819.559 -3241620.096 2.084595482e-11 -109.9679245
 -2324756.457 -2324756.457 1140795.701 -1130.427916
 -2324756.457 -2324756.457 -1140795.701 -1130.428354
@@ -28,7 +28,7 @@
 2324756.457 2324756.457 1140795.701 -1130.428763
 1265819.559 3241620.096 -1.518641958e-11 -109.9683258
 2324756.457 -1140795.701 -2324756.457 -922.8374217
-1265819.559 2.261096449e-11 -3241620.096 12.95300895
+1265819.559 2.261096449e-11 -3241620.096 12.95300896
 3241620.096 -2.335326054e-10 -1265819.559 172.706491
 2324756.457 1140795.701 -2324756.457 -922.8423924
 -1.131907049e-11 1265819.559 -3241620.096 -232.9154335

diff --git a/tests/dynamic_topography_back/dynamic_topography_bottom.00000 b/tests/dynamic_topography_back/dynamic_topography_bottom.00000
@@ -1,9 +1,9 @@
-# x y bottom topography
-112500 0 -20.35932195
-337500 0 -22.5880606
-562500 0 -13.12252722
-787500 0 55.68976695
-1012500 0 55.68976696
-1237500 0 -13.12252721
-1462500 0 -22.58806058
-1687500 0 -20.35932193
+# x y dynamic_topography_bottom
+112500 0 -20.35932198
+337500 0 -22.58806059
+562500 0 -13.12252715
+787500 0 55.68976686
+1012500 0 55.68976686
+1237500 0 -13.12252713
+1462500 0 -22.58806056
+1687500 0 -20.35932195
diff --git a/tests/dynamic_topography_vs_surface_dynamic_topography/dynamic_topography_bottom.00000 b/tests/dynamic_topography_vs_surface_dynamic_topography/dynamic_topography_bottom.00000
@@ -1,9 +1,9 @@
-# x y bottom topography
-112500 0 -20.35932195
-337500 0 -22.5880606
-562500 0 -13.12252722
-787500 0 55.68976695
-1012500 0 55.68976696
-1237500 0 -13.12252721
-1462500 0 -22.58806058
-1687500 0 -20.35932193
+# x y dynamic_topography_bottom
+112500 0 -20.35932198
+337500 0 -22.58806059
+562500 0 -13.12252715
+787500 0 55.68976686
+1012500 0 55.68976686
+1237500 0 -13.12252713
+1462500 0 -22.58806056
+1687500 0 -20.35932195
diff --git a/tests/geoid/dynamic_topography_bottom.00000 b/tests/geoid/dynamic_topography_bottom.00000
@@ -1,4 +1,4 @@
-# x y z bottom topography
+# x y z dynamic_topography_bottom
 -35498.28088 -196824.4702 -2.76471554e-13 -64957.61326
 -70785.07178 -184010.7447 33608.32387 -57553.88554
 -70785.07178 -184010.7447 -33608.32387 -57553.88558
@@ -21,10 +21,10 @@
 -139384.3779 -33822.9268 139384.3779 17280.58779
 -70785.07178 -33608.32387 184010.7447 46185.62438
 -35498.28088 2.394570686e-12 196824.4702 53281.72759
--109044.9905 8.994181261e-12 167657.9555 36339.18081
--70785.07178 33608.32387 184010.7447 46185.62439
+-109044.9905 1.06639181e-11 167657.9555 36339.18081
+-70785.07178 33608.32387 184010.7447 46185.62438
 -184010.7447 -33608.32387 70785.07178 -34581.30002
--167657.9555 2.303524681e-11 109044.9905 -5575.059541
+-167657.9555 2.422576705e-11 109044.9905 -5575.059541
 -196824.4702 -6.462091252e-12 35498.28088 -55980.07258
 -184010.7447 33608.32387 70785.07178 -34581.30001
 -139384.3779 33822.9268 139384.3779 17280.58779
@@ -34,7 +34,7 @@
 1.139428721e-12 -196824.4702 35498.28088 -55980.07254
 33608.32387 -184010.7447 70785.07178 -34581.30002
 -33608.32387 -184010.7447 70785.07178 -34581.29998
-1.755052267e-13 -167657.9555 109044.9905 -5575.05953
+-1.124859754e-13 -167657.9555 109044.9905 -5575.05953
 65351.59161 -159554.7203 101348.2151 -11312.54113
 93118.40502 -125157.8257 125157.8257 7074.749569
 33822.9268 -139384.3779 139384.3779 17280.58781
@@ -66,7 +66,7 @@
 196824.4702 1.139428721e-12 35498.28088 -55980.07262
 184010.7447 33608.32387 70785.07178 -34581.30005
 184010.7447 -33608.32387 70785.07178 -34581.30004
-167657.9555 1.755052267e-13 109044.9905 -5575.059573
+167657.9555 -1.124859754e-13 109044.9905 -5575.059573
 159554.7203 65351.59161 101348.2151 -11312.54113
 125157.8257 93118.40502 125157.8257 7074.749563
 139384.3779 33822.9268 139384.3779 17280.58778
@@ -117,10 +117,10 @@
 139384.3779 -33822.9268 -139384.3779 17280.58779
 70785.07178 -33608.32387 -184010.7447 46185.62438
 35498.28088 -5.604965797e-12 -196824.4702 53281.72758
-109044.9905 -2.700687402e-13 -167657.9555 36339.18079
+109044.9905 -2.096944977e-13 -167657.9555 36339.18079
 70785.07178 33608.32387 -184010.7447 46185.62438
 184010.7447 -33608.32387 -70785.07178 -34581.30002
-167657.9555 3.016508524e-11 -109044.9905 -5575.059554
+167657.9555 3.006269439e-11 -109044.9905 -5575.059554
 196824.4702 5.258792963e-14 -35498.28088 -55980.07261
 184010.7447 33608.32387 -70785.07178 -34581.30003
 139384.3779 33822.9268 -139384.3779 17280.58778
@@ -130,7 +130,7 @@
 -2.253997394e-13 35498.28088 -196824.4702 53281.72758
 -33608.32387 70785.07178 -184010.7447 46185.62437
 33608.32387 70785.07178 -184010.7447 46185.62438
--2.264523378e-12 109044.9905 -167657.9555 36339.1808
+-2.6687275e-12 109044.9905 -167657.9555 36339.1808
 -65351.59161 101348.2151 -159554.7203 31212.29529
 -93118.40502 125157.8257 -125157.8257 7074.749542
 -33822.9268 139384.3779 -139384.3779 17280.58778
@@ -162,7 +162,7 @@
 -35498.28088 1.269621957e-12 -196824.4702 53281.72758
 -70785.07178 -33608.32387 -184010.7447 46185.62437
 -70785.07178 33608.32387 -184010.7447 46185.62438
--109044.9905 1.048488242e-12 -167657.9555 36339.1808
+-109044.9905 5.609360777e-13 -167657.9555 36339.1808
 -101348.2151 -65351.59161 -159554.7203 31212.29529
 -125157.8257 -93118.40502 -125157.8257 7074.749548
 -139384.3779 -33822.9268 -139384.3779 17280.58776

diff --git a/tests/geoid_freesurface/dynamic_topography_bottom.00000 b/tests/geoid_freesurface/dynamic_topography_bottom.00000
@@ -1,4 +1,4 @@
-# x y z bottom topography
+# x y z dynamic_topography_bottom
 -72748.2505 -186300.0055 -6.071532065e-13 -125368.9384
 -133606.6929 -133606.6929 65562.97133 -78544.77983
 -133606.6929 -133606.6929 -65562.97133 -78544.7797

diff --git a/tests/geoid_freesurface/dynamic_topography_bottom.00001 b/tests/geoid_freesurface/dynamic_topography_bottom.00001
@@ -1,4 +1,4 @@
-# x y z bottom topography
+# x y z dynamic_topography_bottom
 -72748.2505 -186300.0055 -6.071532065e-13 -27844.41685
 -133606.6929 -133606.6929 65562.97133 -18750.10657
 -133606.6929 -133606.6929 -65562.97133 -18750.10629