Merge remote-tracking branch 'ESCOMP/main' into feature/ufs_restartfh

ESCOMP · Dec 18, 2024 · 191214b · 191214b
2 parents b5d1cc1 + 4b636c6
commit 191214b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/srt.yml b/.github/workflows/srt.yml
@@ -17,8 +17,9 @@ jobs:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [ 3.x ]
+        python-version: [ 3.8, 3.11, 3.x ]
     env:
       CC: mpicc
       FC: mpifort

diff --git a/cime_config/buildnml b/cime_config/buildnml
@@ -44,6 +44,8 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
     config["MPILIB"] = case.get_value("MPILIB")
     config["OS"] = case.get_value("OS")
     config["TESTCASE"] = case.get_value("TESTCASE")
+    if not config["TESTCASE"]:
+        config["TESTCASE"] = "UNSET"
     config["glc_nec"] = (
         0 if case.get_value("GLC_NEC") == 0 else case.get_value("GLC_NEC")
     )

diff --git a/mediator/med.F90 b/mediator/med.F90
@@ -2269,9 +2269,9 @@ subroutine SetRunClock(gcomp, rc)
     use ESMF                  , only : ESMF_ClockGetAlarmList
     use NUOPC                 , only : NUOPC_CompCheckSetClock, NUOPC_CompAttributeGet
     use NUOPC_Mediator        , only : NUOPC_MediatorGet
-    ! NUOPC_shr_methods is now in cesm_share and cdeps 
+    ! NUOPC_shr_methods is now in cesm_share and cdeps
     use nuopc_shr_methods, only : AlarmInit
-    
+
     ! input/output variables
     type(ESMF_GridComp)  :: gcomp
     integer, intent(out) :: rc
@@ -2603,7 +2603,7 @@ subroutine med_dststatus_write (gcomp, rc)
     type(ESMF_Array)     :: maskarray
     integer(I4), pointer :: meshmask(:)
     real(R8), pointer    :: r8ptr(:)
-    integer              :: m,n1,n2
+    integer              :: m,n2
     character(CL)        :: case_name, dststatusfile
     logical              :: elementMaskIsPresent
     logical              :: whead(2) = (/.true. , .false./)
@@ -2641,9 +2641,9 @@ subroutine med_dststatus_write (gcomp, rc)
                 if (ChkErr(rc,__LINE__,u_FILE_u)) return
                 ! get mask Array
                 call ESMF_FieldGet(maskfield, array=maskarray, rc=rc)
-		if (ChkErr(rc,__LINE__,u_FILE_u)) return
+                if (ChkErr(rc,__LINE__,u_FILE_u)) return
                 call ESMF_MeshGet(mesh_dst, elemMaskArray=maskarray, rc=rc)
-		if (ChkErr(rc,__LINE__,u_FILE_u)) return
+                if (ChkErr(rc,__LINE__,u_FILE_u)) return
                 call ESMF_FieldGet(maskfield, localDe=0, farrayPtr=meshmask, rc=rc)
                 if (ChkErr(rc,__LINE__,u_FILE_u)) return
                 ! now create an R8 mask for writing

diff --git a/mediator/med_phases_restart_mod.F90 b/mediator/med_phases_restart_mod.F90
@@ -522,7 +522,6 @@ subroutine med_phases_restart_read(gcomp, rc)
     character(ESMF_MAXSTR) :: case_name      ! case name
     character(ESMF_MAXSTR) :: restart_file   ! Local path to restart filename
     character(ESMF_MAXSTR) :: restart_pfile  ! Local path to restart pointer filename
-    logical                :: isPresent
     character(len=*), parameter :: subname='(med_phases_restart_read)'
     !---------------------------------------
     call t_startf('MED:'//subname)