Skip to content

Commit 6bc66b7

Browse files
committed
Refactor OGCM IS_FCST to OGCM_IS_FCST
Testing by @sanAkel and @rtodling found that `IS_FCST` was a resource parameter in both the AGCM Grid Comp and in the DataSea and DataIce Grid Comps that was doing different things. In the DataSea and DataIce Grid Comps, it determined persistence of SST/ICE via `MAPL_ReadForcing`. But in the AGCM, it altered IAU handling (I think?). Either way, there was no good way to set one without setting the other. So, for separability, we rename all the oceanic `IS_FCST` to be `OGCM_IS_FCST`. We keep the AGCM `IS_FCST` as it currently is named unless there is a desire to refactor it from @sdrabenh or others.
1 parent 8faac49 commit 6bc66b7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSdataseaice_GridComp/GEOS_DataSeaIceGridComp.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
539539
! In atmospheric forecast mode we do not have future Sea Ice Conc
540540
!---------------------------------------------------------------
541541

542-
call MAPL_GetResource(MAPL,IFCST,LABEL="IS_FCST:",default=0, RC=STATUS)
542+
call MAPL_GetResource(MAPL,IFCST,LABEL="OGCM_IS_FCST:",default=0, RC=STATUS)
543543
VERIFY_(STATUS)
544544

545545
FCST = IFCST==1

GEOSogcm_GridComp/GEOSseaice_GridComp/GEOSdataseaice_GridComp/GEOS_DataSeaIceGridComp_ExtData.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
318318
! In atmospheric forecast mode we do not have future Sea Ice Conc
319319
!----------------------------------------------------------------
320320

321-
call MAPL_GetResource(MAPL,IFCST,LABEL="IS_FCST:",default=0, _RC )
321+
call MAPL_GetResource(MAPL,IFCST,LABEL="OGCM_IS_FCST:",default=0, _RC )
322322
FCST = IFCST==1
323323

324324
! Get relaxation time

0 commit comments

Comments
 (0)