Merge branch 'ufs-dev-PR153' into ufs-dev-PR94

NCAR · Feb 9, 2024 · 5776312 · 5776312
2 parents 4b7236c + d8cb45c
commit 5776312
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,4 @@
-[submodule "physics/rte-rrtmgp"]
+[submodule "physics/Radiation/RRTMGP/rte-rrtmgp"]
   path = physics/Radiation/RRTMGP/rte-rrtmgp
   url = https://github.com/earth-system-radiation/rte-rrtmgp
   branch = main
-[submodule "physics/Radiation/RRTMGP/rte-rrtmgp"]
-	path = physics/Radiation/RRTMGP/rte-rrtmgp
-	url = https://github.com/earth-system-radiation/rte-rrtmgp
diff --git a/physics/GFS_ccpp_suite_sim_pre.F90 → ...FS_SCM_NEPTUNE/GFS_ccpp_suite_sim_pre.F90 b/physics/GFS_ccpp_suite_sim_pre.F90 → ...FS_SCM_NEPTUNE/GFS_ccpp_suite_sim_pre.F90
diff --git a/physics/GFS_ccpp_suite_sim_pre.meta → ...S_SCM_NEPTUNE/GFS_ccpp_suite_sim_pre.meta b/physics/GFS_ccpp_suite_sim_pre.meta → ...S_SCM_NEPTUNE/GFS_ccpp_suite_sim_pre.meta
@@ -1,7 +1,7 @@
 [ccpp-table-properties]
   name = GFS_ccpp_suite_sim_pre
   type = scheme
-  dependencies = machine.F,module_ccpp_suite_simulator.F90
+  dependencies = ../../hooks/machine.F,module_ccpp_suite_simulator.F90
 
 ########################################################################
 [ccpp-arg-table]

diff --git a/physics/ccpp_suite_simulator.F90 → .../UFS_SCM_NEPTUNE/ccpp_suite_simulator.F90 b/physics/ccpp_suite_simulator.F90 → .../UFS_SCM_NEPTUNE/ccpp_suite_simulator.F90
diff --git a/physics/ccpp_suite_simulator.meta → ...UFS_SCM_NEPTUNE/ccpp_suite_simulator.meta b/physics/ccpp_suite_simulator.meta → ...UFS_SCM_NEPTUNE/ccpp_suite_simulator.meta
@@ -1,7 +1,7 @@
 [ccpp-table-properties]
   name = ccpp_suite_simulator
   type = scheme
-  dependencies = machine.F,module_ccpp_suite_simulator.F90
+  dependencies = ../../hooks/machine.F,module_ccpp_suite_simulator.F90
 
 [ccpp-arg-table]
   name = ccpp_suite_simulator_run

diff --git a/physics/module_ccpp_suite_simulator.F90 → ...M_NEPTUNE/module_ccpp_suite_simulator.F90 b/physics/module_ccpp_suite_simulator.F90 → ...M_NEPTUNE/module_ccpp_suite_simulator.F90
diff --git a/physics/module_ccpp_suite_simulator.meta → ..._NEPTUNE/module_ccpp_suite_simulator.meta b/physics/module_ccpp_suite_simulator.meta → ..._NEPTUNE/module_ccpp_suite_simulator.meta
@@ -11,7 +11,7 @@
 [ccpp-table-properties]
   name = module_ccpp_suite_simulator
   type = module
-  dependencies = machine.F
+  dependencies = ../../hooks/machine.F
 
 [ccpp-arg-table]
   name = module_ccpp_suite_simulator