Merge branch 'ufs-community:develop' into feature/add_utils_hsd

ulmononian · Nov 19, 2024 · c3cad35 · c3cad35
2 parents e58e63c + c0367fd
commit c3cad35
Show file tree

Hide file tree

Showing 13 changed files with 2,361 additions and 1,936 deletions.
diff --git a/FV3 b/FV3
diff --git a/NOAHMP-interface/CMakeLists.txt b/NOAHMP-interface/CMakeLists.txt
@@ -13,6 +13,7 @@ list(APPEND _noahmp_cap_files noahmp/drivers/nuopc/lnd_comp_kind.F90
 
 # CCPP interface
 list(APPEND _noahmp_ccpp_files noahmp/drivers/ccpp/noahmpdrv.F90
+                               noahmp/drivers/ccpp/lnd_iau_mod.F90
                                noahmp/drivers/ccpp/sfc_diff.f
                                noahmp/drivers/ccpp/machine.F
                                noahmp/drivers/ccpp/noahmp_tables.f90

diff --git a/NOAHMP-interface/noahmp b/NOAHMP-interface/noahmp
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
+7 −0		ccpp/config/ccpp_prebuild_config.py
+69 −2		ccpp/data/GFS_typedefs.F90
+19 −1		ccpp/data/GFS_typedefs.meta
+16 −0		ccpp/driver/CCPP_driver.F90
+1 −1		ccpp/physics
+1 −0		CMakeLists.txt
+788 −0		drivers/ccpp/lnd_iau_mod.F90
+58 −0		drivers/ccpp/lnd_iau_mod.meta
+295 −2		drivers/ccpp/noahmpdrv.F90
+227 −0		drivers/ccpp/noahmpdrv.meta