Skip to content

Commit

Permalink
The type of the variable DO_DATA_ATM4OCN changed from integer to logi…
Browse files Browse the repository at this point in the history 
…cal.
  • Loading branch information
@mfmehari
mfmehari authored Feb 8, 2024
1 parent 9259e51 commit f9819aa
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions GEOS_GcmGridComp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ module GEOS_GcmGridCompMod
integer :: NUM_ICE_LAYERS
integer, parameter :: NUM_SNOW_LAYERS=1
integer :: DO_CICE_THERMO
integer :: DO_DATA_ATM4OCN
integer :: DO_OBIO
integer :: DO_DATASEA
integer :: DO_WAVES
integer :: DO_SEA_SPRAY
logical :: seaIceT_extData
logical :: DO_DATA_ATM4OCN

!=============================================================================

Expand Down Expand Up @@ -206,7 +206,7 @@ subroutine SetServices ( GC, RC )
endif

call MAPL_GetResource ( MAPL, DO_OBIO, Label="USE_OCEANOBIOGEOCHEM:", DEFAULT=0, _RC)
call MAPL_GetResource ( MAPL, DO_DATA_ATM4OCN, Label="USE_DATA_ATM4OCN:", DEFAULT=0, _RC)
call MAPL_GetResource ( MAPL, DO_DATA_ATM4OCN, Label="USE_DATA_ATM4OCN:", DEFAULT=.FALSE., _RC)
call MAPL_GetResource ( MAPL, DO_DATASEA, Label="USE_DATASEA:", DEFAULT=1, _RC)
call MAPL_GetResource ( MAPL, seaIceT_extData, Label="SEAICE_THICKNESS_EXT_DATA:", DEFAULT=.FALSE., _RC )
call MAPL_GetResource ( MAPL, DO_WAVES, Label="USE_WAVES:", DEFAULT=0, _RC)
Expand Down Expand Up @@ -245,7 +245,7 @@ subroutine SetServices ( GC, RC )
! Create childrens gridded components and invoke their SetServices
! ----------------------------------------------------------------

if(DO_DATA_ATM4OCN/=0) then
if(DO_DATA_ATM4OCN) then
AGCM = MAPL_AddChild(GC, NAME='DATAATM', SS=DATAATM_SetServices, RC=STATUS)
VERIFY_(STATUS)
else
Expand Down Expand Up @@ -378,7 +378,7 @@ subroutine SetServices ( GC, RC )

! Export for IAU and/or Analysis purposes
! ---------------------------------------
if(DO_DATA_ATM4OCN==0) then
if(.not. DO_DATA_ATM4OCN) then
call MAPL_AddExportSpec ( GC, &
SHORT_NAME = 'AK', &
CHILD_ID = AGCM, &
Expand Down Expand Up @@ -536,7 +536,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)
endif

if(DO_DATA_ATM4OCN==0) then
if(.not. DO_DATA_ATM4OCN) then
call MAPL_AddConnectivity ( GC, &
SHORT_NAME = (/'PHIS ','AK ','BK ','U ','V ','TV ','PS ','DELP ','O3PPMV', 'TS ','AREA '/), &
DST_ID = AIAU, &
Expand Down Expand Up @@ -740,7 +740,7 @@ end subroutine history_setservice

subroutine OBIO_TerminateImports(DO_DATA_ATM4OCN, RC)

integer, intent(IN ) :: DO_DATA_ATM4OCN
logical, intent(IN ) :: DO_DATA_ATM4OCN
integer, optional, intent( OUT) :: RC

character(len=ESMF_MAXSTR), parameter :: IAm="OBIO_TerminateImports"
Expand All @@ -766,7 +766,7 @@ subroutine OBIO_TerminateImports(DO_DATA_ATM4OCN, RC)
RC=STATUS )
VERIFY_(STATUS)

if(DO_DATA_ATM4OCN==0) then
if(.not. DO_DATA_ATM4OCN) then
call MAPL_TerminateImport ( GC, &
SHORT_NAME = (/'BCDP', 'BCWT', 'OCDP', 'OCWT' /), &
CHILD = OGCM, &
Expand Down Expand Up @@ -957,7 +957,7 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )
VERIFY_(STATUS)
call ESMF_GridCompSet(GCS(OGCM), grid=ogrid, rc=status)
VERIFY_(STATUS)
if(DO_DATA_ATM4OCN==0) then
if(.not. DO_DATA_ATM4OCN) then
call ESMF_GridCompSet(GCS(AIAU), grid=agrid, rc=status)
VERIFY_(STATUS)
call ESMF_GridCompSet(GCS(ADFI), grid=agrid, rc=status)
Expand Down Expand Up @@ -1558,7 +1558,7 @@ end subroutine AllocateExports_UGD

subroutine AllocateExports_OBIO(DO_DATA_ATM4OCN, RC)

integer, intent(IN ) :: DO_DATA_ATM4OCN
logical, intent(IN ) :: DO_DATA_ATM4OCN
integer, optional, intent( OUT) :: RC

integer :: STATUS
Expand All @@ -1584,7 +1584,7 @@ subroutine AllocateExports_OBIO(DO_DATA_ATM4OCN, RC)
RC=STATUS )
VERIFY_(STATUS)

if(DO_DATA_ATM4OCN==0) then
if(.not. DO_DATA_ATM4OCN) then
call AllocateExports_UGD( GCM_INTERNAL_STATE%expSKIN, &
(/'BCDP', 'BCWT', 'OCDP', 'OCWT' /), &
RC=STATUS )
Expand Down Expand Up @@ -1718,9 +1718,9 @@ subroutine Run ( GC, IMPORT, EXPORT, CLOCK, RC )
call MAPL_Get ( MAPL, GCS=GCS, GIM=GIM, GEX=GEX, RC=STATUS )
VERIFY_(STATUS)

! Check for Default DO_DATA_ATM4OCN=0 (FALSE) mode
! Check for Default DO_DATA_ATM4OCN FALSE mode
! -------------------------------------------
if(DO_DATA_ATM4OCN==0) then
if(.not. DO_DATA_ATM4OCN) then

call MAPL_GetResource(MAPL, ReplayMode, 'REPLAY_MODE:', default="NoReplay", RC=STATUS )
VERIFY_(STATUS)
Expand Down Expand Up @@ -2012,7 +2012,7 @@ subroutine Run ( GC, IMPORT, EXPORT, CLOCK, RC )
!--------------------

call MAPL_TimerOn(MAPL,"--ATMOSPHERE" )
if(DO_DATA_ATM4OCN/=0) then
if(DO_DATA_ATM4OCN) then
call MAPL_TimerOn(MAPL,"DATAATM" )
else
call MAPL_TimerOn(MAPL,"AGCM" )
Expand All @@ -2021,14 +2021,14 @@ subroutine Run ( GC, IMPORT, EXPORT, CLOCK, RC )
call ESMF_GridCompRun ( GCS(AGCM), importState=GIM(AGCM), exportState=GEX(AGCM), clock=clock, userRC=status )
VERIFY_(STATUS)

if(DO_DATA_ATM4OCN/=0) then
if(DO_DATA_ATM4OCN) then
call MAPL_TimerOff(MAPL,"DATAATM" )
else
call MAPL_TimerOff(MAPL,"AGCM" )
endif
call MAPL_TimerOff(MAPL,"--ATMOSPHERE" )

if(DO_DATA_ATM4OCN==0) then
if(.not. DO_DATA_ATM4OCN) then
! Accumulate for digital filter
! -----------------------------
call ESMF_GridCompRun ( GCS(ADFI), importState=GIM(ADFI), exportState=GEX(ADFI), clock=clock, userRC=status )
Expand Down Expand Up @@ -2407,7 +2407,7 @@ end subroutine RUN_WAVES

subroutine OBIO_A2O(DO_DATA_ATM4OCN, RC)

integer, intent(IN ) :: DO_DATA_ATM4OCN
logical, intent(IN ) :: DO_DATA_ATM4OCN
integer, optional, intent( OUT) :: RC

integer :: STATUS
Expand All @@ -2430,7 +2430,7 @@ subroutine OBIO_A2O(DO_DATA_ATM4OCN, RC)
call DO_A2O_UGD(GIM(OGCM), 'DFBAND', expSKIN, 'DFBAND', RC=STATUS)
VERIFY_(STATUS)

if(DO_DATA_ATM4OCN==0) then
if(.not. DO_DATA_ATM4OCN) then
call DO_A2O_UGD(GIM(OGCM), 'BCDP', expSKIN, 'BCDP', RC=STATUS)
VERIFY_(STATUS)
call DO_A2O_UGD(GIM(OGCM), 'BCWT', expSKIN, 'BCWT', RC=STATUS)
Expand Down

0 comments on commit f9819aa

Please sign in to comment.