Merge remote-tracking branch 'fms/main' into create_coupler_wrapper

NOAA-GFDL · Mar 11, 2024 · 4f10df3 · 4f10df3
2 parents cdd38b1 + b7d29da
commit 4f10df3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/SHiELD/coupler_main.F90 b/SHiELD/coupler_main.F90
@@ -249,6 +249,8 @@ subroutine coupler_init
 
 !----- override calendar type with namelist value -----
       select case( fms_mpp_uppercase(trim(calendar)) )
+      case( 'GREGORIAN' )
+          calendar_type = GREGORIAN
       case( 'JULIAN' )
           calendar_type = JULIAN
       case( 'NOLEAP' )
@@ -259,7 +261,7 @@ subroutine coupler_init
           calendar_type = NO_CALENDAR
       case default
           call fms_mpp_error ( FATAL, 'COUPLER_MAIN: coupler_nml entry calendar must '// &
-                                  'be one of JULIAN|NOLEAP|THIRTY_DAY|NO_CALENDAR.' )
+                                  'be one of GREGORIAN|JULIAN|NOLEAP|THIRTY_DAY|NO_CALENDAR.' )
       end select
 
     endif

diff --git a/full/coupler_main.F90 b/full/coupler_main.F90
@@ -828,6 +828,7 @@ program coupler_main
       ! does not modify either Ocean or Ice_ocean_boundary
       call flux_ocean_from_ice_stocks(Ocean_state, Ocean, Ice_ocean_boundary)
 
+      call fms_diag_send_complete(Time_step_cpld)
       Time_ocean = Time_ocean +  Time_step_cpld
       Time = Time_ocean