Merge branch 'main' into sst_Had_update

ESCOMP · Jan 26, 2024 · 30a360c · 30a360c
2 parents ee00179 + 28cc73e
commit 30a360c
Show file tree

Hide file tree

Showing 5 changed files with 1,126 additions and 31 deletions.
diff --git a/drof/cime_config/config_component.xml b/drof/cime_config/config_component.xml
@@ -13,7 +13,7 @@
   -->
 
   <description modifier_mode="1">
-    <desc rof="DROF[%NULL][%NYF][%IAF][%IAFAIS00][%IAFAIS45][%IAFAIS55][%CPLHIST][%JRA][%JRA-1p4-2018][%JRA-1p4-2018-AIS0ICE][%JRA-1p4-2018-AIS0LIQ][%JRA-1p4-2018-AIS0ROF[%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304]">Data runoff model</desc>
+    <desc rof="DROF[%NULL][%NYF][%IAF][%IAFAIS00][%IAFAIS45][%IAFAIS55][%CPLHIST][%JRA][%JRA-1p4-2018][%JRA-1p4-2018-AIS0ICE][%JRA-1p4-2018-AIS0LIQ][%JRA-1p4-2018-AIS0ROF][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304]">Data runoff model</desc>
     <desc option="NULL"     >NULL mode</desc>
     <desc option="NYF"      >COREv2 normal year forcing:</desc>
     <desc option="IAF"      >COREv2 interannual year forcing:</desc>

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library(cdeps_share  ${GenF90_SRCS}
                          shr_timer_mod.F90
                          shr_cal_mod.F90
                          shr_kind_mod.F90
+                         shr_file_mod.F90
                          shr_sys_mod.F90
                          shr_abort_mod.F90
                          shr_const_mod.F90