Merge branch 'develop' into bugfix/rreichle/snow_excs

Author: gmao-rreichle

GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSdataseaice_GridComp/GEOS_DataSeaIceGridComp.F90

@@ -539,7 +539,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
 ! In atmospheric forecast mode we do not have future Sea Ice Conc
 !---------------------------------------------------------------
 
-    call MAPL_GetResource(MAPL,IFCST,LABEL="IS_FCST:",default=0,   RC=STATUS)
+    call MAPL_GetResource(MAPL,IFCST,LABEL="OGCM_IS_FCST:",default=0,   RC=STATUS)
     VERIFY_(STATUS)
 
     FCST = IFCST==1

GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSdataseaice_GridComp/GEOS_DataSeaIceGridComp_ExtData.F90

@@ -318,7 +318,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
 ! In atmospheric forecast mode we do not have future Sea Ice Conc
 !----------------------------------------------------------------
 
-    call MAPL_GetResource(MAPL,IFCST,LABEL="IS_FCST:",default=0, _RC )
+    call MAPL_GetResource(MAPL,IFCST,LABEL="OGCM_IS_FCST:",default=0, _RC )
     FCST = IFCST==1
 
 ! Get relaxation time