updates DomainFunction usage to use getType() instead of name()

amanzi · Mar 5, 2024 · 0d9d2c2 · 0d9d2c2
1 parent 05b7aa0
commit 0d9d2c2
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 275 deletions.
diff --git a/src/pks/CMakeLists.txt b/src/pks/CMakeLists.txt
@@ -52,7 +52,6 @@ add_amanzi_library(ats_pks
 add_subdirectory(energy)
 add_subdirectory(flow)
 add_subdirectory(transport)
-add_subdirectory(transport/sediment_transport)
 add_subdirectory(deform)
 add_subdirectory(surface_balance)
 add_subdirectory(biogeochemistry)

diff --git a/src/pks/transport/CMakeLists.txt b/src/pks/transport/CMakeLists.txt
@@ -5,10 +5,6 @@
 #    Transport Amanzi
 #
 
-
-# ATS include directories
-#add_subdirectory(sediment_transport)
-
 #================================================
 # register evaluators/factories/pks
 
@@ -25,11 +21,21 @@ set(ats_transport_src_files
   transport_ats_vandv.cc
   transport_ats_initialize.cc
   transport_ats_pk.cc
+  # sediment_transport/sediment_transport_pk.cc
+  # sediment_transport/erosion_evaluator.cc
+  # sediment_transport/settlement_evaluator.cc
+  # sediment_transport/trapping_evaluator.cc
+  # sediment_transport/organic_matter_evaluator.cc  
  )
 
 
 set(ats_transport_inc_files
   transport_ats.hh
+  # sediment_transport/sediment_transport_pk.hh
+  # sediment_transport/erosion_evaluator.hh
+  # sediment_transport/settlement_evaluator.hh
+  # sediment_transport/trapping_evaluator.hh
+  # sediment_transport/organic_matter_evaluator.hh
   )
 
 
@@ -68,6 +74,30 @@ register_evaluator_with_factory(
   LISTNAME   ATS_TRANSPORT_REG
   )
 
+# register_evaluator_with_factory(
+#   HEADERFILE sediment_transport/sediment_transport_reg.hh
+#   LISTNAME   ATS_TRANSPORT_REG
+#   )
+
+# # sediment diposition and erosion rates
+# register_evaluator_with_factory(
+#   HEADERFILE sediment_transport/erosion_evaluator_reg.hh
+#   LISTNAME ATS_TRANSPORT_REG
+#   )
+# register_evaluator_with_factory(
+#   HEADERFILE sediment_transport/settlement_evaluator_reg.hh
+#   LISTNAME ATS_TRANSPORT_REG
+#   )
+# register_evaluator_with_factory(
+#   HEADERFILE sediment_transport/trapping_evaluator_reg.hh
+#   LISTNAME ATS_TRANSPORT_REG
+#   )
+# register_evaluator_with_factory(
+#   HEADERFILE sediment_transport/organic_matter_evaluator_reg.hh
+#   LISTNAME ATS_TRANSPORT_REG
+#   )
+
+
 generate_evaluators_registration_header(
   HEADERFILE ats_transport_registration.hh
   LISTNAME   ATS_TRANSPORT_REG

diff --git a/src/pks/transport/sediment_transport/CMakeLists.txt b/src/pks/transport/sediment_transport/CMakeLists.txt
diff --git a/src/pks/transport/sediment_transport/SedimentTransportDefs.hh b/src/pks/transport/sediment_transport/SedimentTransportDefs.hh
@@ -16,7 +16,7 @@
 #define AMANZI_TRANSPORT_CONSTANTS_HH_
 
 namespace Amanzi {
-namespace SedimentTransport {
+namespace Transport {
 
 // const int TRANSPORT_PHASE_LIQUID = 0;  // phases from 0 to 1
 // const int TRANSPORT_PHASE_GAS = 1;

diff --git a/src/pks/transport/sediment_transport/TransportDomainFunction.hh b/src/pks/transport/sediment_transport/TransportDomainFunction.hh
diff --git a/src/pks/transport/sediment_transport/Transport_Diffusion.cc b/src/pks/transport/sediment_transport/Transport_Diffusion.cc