Merge remote-tracking branch 'escomp/master' into feature/updcmeps

NorESMhub · Nov 8, 2022 · 56d71e4 · 56d71e4
2 parents aabe844 + fa2ac92
commit 56d71e4
Show file tree

Hide file tree

Showing 7 changed files with 300 additions and 244 deletions.
diff --git a/cesm/driver/esm_time_mod.F90 b/cesm/driver/esm_time_mod.F90
@@ -522,7 +522,7 @@ subroutine esm_time_alarmInit( clock, alarm, option, &
       if (ChkErr(rc,__LINE__,u_FILE_u)) return
       update_nextalarm  = .true.
 
-   case (optNYears)
+   case (optNYears, trim(optNYears)//'s')
       call ESMF_TimeIntervalSet(AlarmInterval, yy=1, rc=rc)
       if (ChkErr(rc,__LINE__,u_FILE_u)) return
       AlarmInterval = AlarmInterval * opt_n