Merge pull request #10 from ACCESS-NRI/rc-2025.08.000

Release candidate - 2025.08.000

Author: anton-seaice

CDEPS/CDEPS

@@ -31,7 +31,6 @@ target_link_libraries(ACCESS3_cdeps_datm
   PRIVATE Access3::cdeps_common Access3::share
 )
 target_sources(ACCESS3_cdeps_datm PRIVATE
-  CDEPS/datm/datm_datamode_cfsr_mod.F90
   CDEPS/datm/datm_datamode_clmncep_mod.F90
   CDEPS/datm/datm_datamode_core2_mod.F90
   CDEPS/datm/datm_datamode_cplhist_mod.F90
@@ -72,6 +71,7 @@ target_link_libraries(ACCESS3_cdeps_dice
   PRIVATE Access3::cdeps_common Access3::share
 )
 target_sources(ACCESS3_cdeps_dice PRIVATE
+  CDEPS/dice/dice_datamode_cplhist_mod.F90
   CDEPS/dice/dice_datamode_ssmi_mod.F90
   CDEPS/dice/dice_flux_atmice_mod.F90
   CDEPS/dice/ice_comp_nuopc.F90

CDEPS/CMakeLists.txt

@@ -5,7 +5,7 @@ diff --git a/datm/atm_comp_nuopc.F90 b/datm/atm_comp_nuopc.F90
 index b74e0d3..bb31c22 100644
 --- a/datm/atm_comp_nuopc.F90
 +++ b/datm/atm_comp_nuopc.F90
-@@ -48,6 +48,10 @@ module cdeps_datm_comp
+@@ -47,6 +47,10 @@ module cdeps_datm_comp
    use datm_datamode_jra_mod     , only : datm_datamode_jra_init_pointers
    use datm_datamode_jra_mod     , only : datm_datamode_jra_advance
 
@@ -16,15 +16,15 @@ index b74e0d3..bb31c22 100644
    use datm_datamode_clmncep_mod , only : datm_datamode_clmncep_advertise
    use datm_datamode_clmncep_mod , only : datm_datamode_clmncep_init_pointers
    use datm_datamode_clmncep_mod , only : datm_datamode_clmncep_advance
-@@ -357,6 +361,7 @@ contains
+@@ -355,6 +359,7 @@ contains
      if ( trim(datamode) == 'CORE2_NYF'    .or. &
           trim(datamode) == 'CORE2_IAF'    .or. &
           trim(datamode) == 'CORE_IAF_JRA' .or. &
 +         trim(datamode) == 'JRA55do'      .or. &
           trim(datamode) == 'CLMNCEP'      .or. &
           trim(datamode) == 'CPLHIST'      .or. &
           trim(datamode) == 'GEFS'         .or. &
-@@ -377,6 +382,10 @@ contains
+@@ -375,6 +380,10 @@ contains
         call datm_datamode_jra_advertise(exportState, fldsExport, flds_scalar_name, &
              flds_co2, flds_wiso, flds_presaero, flds_presndep, rc)
         if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -35,7 +35,7 @@ index b74e0d3..bb31c22 100644
      case ('CLMNCEP')
         call datm_datamode_clmncep_advertise(exportState, fldsExport, flds_scalar_name, &
              flds_co2, flds_wiso, flds_presaero, flds_presndep, flds_preso3, rc)
-@@ -627,6 +636,9 @@ contains
+@@ -623,6 +632,9 @@ contains
         case('CORE_IAF_JRA')
            call datm_datamode_jra_init_pointers(exportState, sdat, rc)
            if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -45,16 +45,16 @@ index b74e0d3..bb31c22 100644
         case('CLMNCEP')
            call datm_datamode_clmncep_init_pointers(importState, exportState, sdat, rc)
            if (ChkErr(rc,__LINE__,u_FILE_u)) return
-@@ -652,7 +664,7 @@ contains
+@@ -645,7 +657,7 @@ contains
            call shr_get_rpointer_name(gcomp, 'atm', target_ymd, target_tod, rpfile, 'read', rc)
            if (ChkErr(rc,__LINE__,u_FILE_u)) return
            select case (trim(datamode))
--          case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','CLMNCEP','CPLHIST','ERA5','GEFS','CFSR','SIMPLE')
-+          case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','JRA55do','CLMNCEP','CPLHIST','ERA5','GEFS','CFSR','SIMPLE')
+-          case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','CLMNCEP','CPLHIST','ERA5','GEFS','SIMPLE')
++          case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','JRA55do','CLMNCEP','CPLHIST','ERA5','GEFS','SIMPLE')
               call dshr_restart_read(restfilm, rpfile, logunit, my_task, mpicom, sdat, rc)
               if (ChkErr(rc,__LINE__,u_FILE_u)) return
            case default
-@@ -694,6 +706,9 @@ contains
+@@ -688,6 +700,9 @@ contains
      case('CORE_IAF_JRA')
         call datm_datamode_jra_advance(exportstate, target_ymd, target_tod, sdat%model_calendar, rc)
         if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -64,12 +64,12 @@ index b74e0d3..bb31c22 100644
      case('CLMNCEP')
         call datm_datamode_clmncep_advance(mainproc, logunit, mpicom,  rc)
         if (ChkErr(rc,__LINE__,u_FILE_u)) return
-@@ -722,7 +737,7 @@ contains
+@@ -716,7 +731,7 @@ contains
         call shr_get_rpointer_name(gcomp, 'atm', target_ymd, target_tod, rpfile, 'write', rc)
         if (ChkErr(rc,__LINE__,u_FILE_u)) return
         select case (trim(datamode))
--       case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','CLMNCEP','CPLHIST','ERA5','GEFS','CFSR','SIMPLE')
-+       case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','JRA55do','CLMNCEP','CPLHIST','ERA5','GEFS','CFSR','SIMPLE')
+-       case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','CLMNCEP','CPLHIST','ERA5','GEFS','SIMPLE')
++       case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','JRA55do','CLMNCEP','CPLHIST','ERA5','GEFS','SIMPLE')
            call dshr_restart_write(rpfile, case_name, 'datm', inst_suffix, target_ymd, target_tod, logunit, &
                 my_task, sdat, rc)
            if (ChkErr(rc,__LINE__,u_FILE_u)) return

CDEPS/patches/atm_comp_nuopc.F90.patch

@@ -24,6 +24,7 @@ target_sources(share PRIVATE
 
   # Modules shared among several components
   CESM_share/include/shr_assert.h
+  CESM_share/src/nuopc_shr_methods.F90
   CESM_share/src/shr_abort_mod.F90
   CESM_share/src/shr_cal_mod.F90
   CESM_share/src/shr_file_mod.F90
@@ -47,7 +48,6 @@ target_sources(share PRIVATE
   # The following file is a stub.
   stubs/mct_mod.F90
 )
-add_patched_source(share CESM_share/src/nuopc_shr_methods.F90)
 add_patched_source(share CESM_share/src/shr_const_mod.F90)
 
 if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")