Fix for Amanzi on_mem_space fix

amanzi · Jan 19, 2024 · 3e2739e · 3e2739e
1 parent ef54657
commit 3e2739e
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 17 deletions.
diff --git a/src/executables/coordinator.cc b/src/executables/coordinator.cc
@@ -580,7 +580,7 @@ Coordinator::advance()
         }
 
         // undeform the mesh
-        Amanzi::AmanziMesh::MeshAlgorithms::deform(*(mesh->second.first), node_ids, old_positions);
+        Amanzi::AmanziMesh::deform(*(mesh->second.first), node_ids, old_positions);
       }
     }
   }

diff --git a/src/pks/deform/volumetric_deformation.cc b/src/pks/deform/volumetric_deformation.cc
@@ -599,7 +599,7 @@ VolumetricDeformation::AdvanceStep(double t_old, double t_new, bool reinit)
       }
 
       for (auto& p : new_positions) { AMANZI_ASSERT(AmanziGeometry::norm(p) >= 0.); }
-      AmanziMesh::MeshAlgorithms::deform(*mesh_nc_, node_ids, new_positions);
+      AmanziMesh::deform(*mesh_nc_, node_ids, new_positions);
       deformed_this_step_ = true;
       // INSERT EXTRA CODE TO UNDEFORM THE MESH FOR MIN_VOLS!
       break;
@@ -630,7 +630,7 @@ VolumetricDeformation::AdvanceStep(double t_old, double t_new, bool reinit)
         surface_nodeids[i] = i;
         surface_newpos[i] = coord_domain;
       }
-      AmanziMesh::MeshAlgorithms::deform(*surf3d_mesh_nc_, surface_nodeids, surface_newpos);
+      AmanziMesh::deform(*surf3d_mesh_nc_, surface_nodeids, surface_newpos);
     }
 
     // Note, this order is intentionally odd.  The deforming cell volume

diff --git a/src/pks/energy/energy_base_physics.cc b/src/pks/energy/energy_base_physics.cc
@@ -20,7 +20,7 @@ de/dt + q dot grad h = div Ke grad T + S?
 #include "energy_base.hh"
 #include "Op.hh"
 #include "pk_helpers.hh"
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 
 namespace Amanzi {
 namespace Energy {

diff --git a/src/pks/energy/energy_base_pk.cc b/src/pks/energy/energy_base_pk.cc
@@ -23,7 +23,7 @@
 #include "CompositeVectorFunction.hh"
 #include "CompositeVectorFunctionFactory.hh"
 #include "pk_helpers.hh"
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 
 #include "energy_base.hh"
 

diff --git a/src/pks/flow/constitutive_relations/elevation/elevation_evaluator_column.cc b/src/pks/flow/constitutive_relations/elevation/elevation_evaluator_column.cc
@@ -92,7 +92,7 @@ ColumnElevationEvaluator::EvaluateElevationAndSlope_(const State& S,
 
   // get neighboring cell ids
   for (int c = 0; c != ncells; c++) {
-    auto nadj_cellids = AmanziMesh::MeshAlgorithms::getCellFaceAdjacentCells(
+    auto nadj_cellids = AmanziMesh::getCellFaceAdjacentCells(
       *S.GetMesh(surface_domain_), c, AmanziMesh::Parallel_kind::ALL);
     int nface_pcell = S.GetMesh(surface_domain_)->getCellNumFaces(c);
 

diff --git a/src/pks/flow/constitutive_relations/elevation/fractional_conductance_evaluator.cc b/src/pks/flow/constitutive_relations/elevation/fractional_conductance_evaluator.cc
@@ -7,7 +7,7 @@
   Authors:
 */
 
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 #include "fractional_conductance_evaluator.hh"
 #include "subgrid_microtopography.hh"
 

diff --git a/src/pks/flow/constitutive_relations/elevation/meshed_elevation_evaluator.cc b/src/pks/flow/constitutive_relations/elevation/meshed_elevation_evaluator.cc
@@ -14,7 +14,7 @@
 #define _USE_MATH_DEFINES
 #include <cmath>
 
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 #include "Mesh.hh"
 #include "Point.hh"
 #include "meshed_elevation_evaluator.hh"

diff --git a/src/pks/flow/constitutive_relations/elevation/subgrid_mobile_depth_evaluator.cc b/src/pks/flow/constitutive_relations/elevation/subgrid_mobile_depth_evaluator.cc
@@ -7,7 +7,7 @@
   Authors:
 */
 
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 #include "subgrid_mobile_depth_evaluator.hh"
 
 namespace Amanzi {

diff --git a/src/pks/flow/constitutive_relations/elevation/volumetric_ponded_depth_evaluator.cc b/src/pks/flow/constitutive_relations/elevation/volumetric_ponded_depth_evaluator.cc
@@ -20,7 +20,7 @@
 
 */
 
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 #include "volumetric_ponded_depth_evaluator.hh"
 #include "subgrid_microtopography.hh"
 

diff --git a/src/pks/flow/constitutive_relations/elevation/volumetric_snow_ponded_depth_evaluator.cc b/src/pks/flow/constitutive_relations/elevation/volumetric_snow_ponded_depth_evaluator.cc
@@ -22,7 +22,7 @@
 
 */
 
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 #include "volumetric_snow_ponded_depth_evaluator.hh"
 #include "subgrid_microtopography.hh"
 

diff --git a/src/pks/flow/constitutive_relations/overland_conductivity/overland_conductivity_evaluator.cc b/src/pks/flow/constitutive_relations/overland_conductivity/overland_conductivity_evaluator.cc
@@ -12,7 +12,7 @@
 
 */
 
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 #include "overland_conductivity_evaluator.hh"
 #include "manning_conductivity_model.hh"
 

diff --git a/...w/constitutive_relations/overland_conductivity/overland_conductivity_subgrid_evaluator.cc b/...w/constitutive_relations/overland_conductivity/overland_conductivity_subgrid_evaluator.cc
@@ -12,7 +12,7 @@
 
 */
 
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 #include "overland_conductivity_subgrid_evaluator.hh"
 #include "manning_conductivity_model.hh"
 

diff --git a/src/pks/mpc/mpc_surface_subsurface_helpers.hh b/src/pks/mpc/mpc_surface_subsurface_helpers.hh
@@ -10,7 +10,7 @@
 #ifndef PKS_MPC_SURFACE_SUBSURFACE_HELPERS_HH_
 #define PKS_MPC_SURFACE_SUBSURFACE_HELPERS_HH_
 
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 #include "CompositeVector.hh"
 
 namespace Amanzi {

diff --git a/src/pks/pk_helpers.cc b/src/pks/pk_helpers.cc
@@ -8,7 +8,7 @@
 */
 
 //! A set of helper functions for doing common things in PKs.
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 #include "Chemistry_PK.hh"
 #include "pk_helpers.hh"
 
@@ -312,7 +312,7 @@ copyVectorToMeshCoordinates(const CompositeVector& vec, AmanziMesh::Mesh& mesh)
       new_positions[n] = Amanzi::AmanziGeometry::Point{ nodes[0][n], nodes[1][n], nodes[2][n] };
     }
   }
-  Amanzi::AmanziMesh::MeshAlgorithms::deform(mesh, node_ids, new_positions);
+  Amanzi::AmanziMesh::deform(mesh, node_ids, new_positions);
 }
 
 int

diff --git a/src/pks/transport/transport_ats_pk.cc b/src/pks/transport/transport_ats_pk.cc
@@ -27,7 +27,7 @@
 #include "Explicit_TI_RK.hh"
 #include "Evaluator.hh"
 #include "Mesh.hh"
-#include "Mesh_Algorithms.hh"
+#include "MeshAlgorithms.hh"
 #include "OperatorDefs.hh"
 #include "PDE_DiffusionFactory.hh"
 #include "PDE_Diffusion.hh"
-Original file line number
+Diff line change
@@ Expand Up / @@ -580,7 +580,7 @@ Coordinator::advance() @@
             }
             // undeform the mesh
-            Amanzi::AmanziMesh::MeshAlgorithms::deform(*(mesh->second.first), node_ids, old_positions);
+            Amanzi::AmanziMesh::deform(*(mesh->second.first), node_ids, old_positions);
           }
         }
       }
@@ Expand Down @@