Skip to content

Commit a4b13a8

Browse files
danrosen25danrosen25
committed
Fix NUOPC cap for GNU compilers
1 parent cead267 commit a4b13a8

File tree

2 files changed

+42
-42
lines changed

2 files changed

+42
-42
lines changed

‎trunk/NDHMS/CPL/NUOPC_cpl/WRFHydro_NUOPC_Cap.F90‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -372,15 +372,15 @@ subroutine InitializeP0(gcomp, importState, exportState, clock, rc)
372372
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
373373
if (ESMF_STDERRORCHECK(rc)) return ! bail out
374374
diagnostic = ESMF_UtilString2Int(value, &
375-
specialStringList=(/"min","max","bit16","maxplus"/), &
376-
specialValueList=(/0,65535,65536,131071/), rc=rc)
375+
specialStringList=(/"max ","high","low ","off "/), &
376+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
377377
if (ESMF_STDERRORCHECK(rc)) return ! bail out
378378
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
379379
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
380380
if (ESMF_STDERRORCHECK(rc)) return ! bail out
381381
verbosity = ESMF_UtilString2Int(value, &
382-
specialStringList=(/"min","max","bit16","maxplus"/), &
383-
specialValueList=(/0,65535,65536,131071/), rc=rc)
382+
specialStringList=(/"max ","high","low ","off "/), &
383+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
384384
if (ESMF_STDERRORCHECK(rc)) return ! bail out
385385

386386
! query Component for its internal State
@@ -783,15 +783,15 @@ subroutine InitializeP1(gcomp, importState, exportState, clock, rc)
783783
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
784784
if (ESMF_STDERRORCHECK(rc)) return ! bail out
785785
diagnostic = ESMF_UtilString2Int(value, &
786-
specialStringList=(/"min","max","bit16","maxplus"/), &
787-
specialValueList=(/0,65535,65536,131071/), rc=rc)
786+
specialStringList=(/"max ","high","low ","off "/), &
787+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
788788
if (ESMF_STDERRORCHECK(rc)) return ! bail out
789789
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
790790
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
791791
if (ESMF_STDERRORCHECK(rc)) return ! bail out
792792
verbosity = ESMF_UtilString2Int(value, &
793-
specialStringList=(/"min","max","bit16","maxplus"/), &
794-
specialValueList=(/0,65535,65536,131071/), rc=rc)
793+
specialStringList=(/"max ","high","low ","off "/), &
794+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
795795
if (ESMF_STDERRORCHECK(rc)) return ! bail out
796796

797797
! query Component for its internal State
@@ -875,15 +875,15 @@ subroutine InitializeP3(gcomp, importState, exportState, clock, rc)
875875
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
876876
if (ESMF_STDERRORCHECK(rc)) return ! bail out
877877
diagnostic = ESMF_UtilString2Int(value, &
878-
specialStringList=(/"min","max","bit16","maxplus"/), &
879-
specialValueList=(/0,65535,65536,131071/), rc=rc)
878+
specialStringList=(/"max ","high","low ","off "/), &
879+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
880880
if (ESMF_STDERRORCHECK(rc)) return ! bail out
881881
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
882882
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
883883
if (ESMF_STDERRORCHECK(rc)) return ! bail out
884884
verbosity = ESMF_UtilString2Int(value, &
885-
specialStringList=(/"min","max","bit16","maxplus"/), &
886-
specialValueList=(/0,65535,65536,131071/), rc=rc)
885+
specialStringList=(/"max ","high","low ","off "/), &
886+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
887887
if (ESMF_STDERRORCHECK(rc)) return ! bail out
888888

889889
! query Component for its internal State
@@ -985,15 +985,15 @@ subroutine DataInitialize(gcomp, rc)
985985
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
986986
if (ESMF_STDERRORCHECK(rc)) return ! bail out
987987
diagnostic = ESMF_UtilString2Int(value, &
988-
specialStringList=(/"min","max","bit16","maxplus"/), &
989-
specialValueList=(/0,65535,65536,131071/), rc=rc)
988+
specialStringList=(/"max ","high","low ","off "/), &
989+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
990990
if (ESMF_STDERRORCHECK(rc)) return ! bail out
991991
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
992992
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
993993
if (ESMF_STDERRORCHECK(rc)) return ! bail out
994994
verbosity = ESMF_UtilString2Int(value, &
995-
specialStringList=(/"min","max","bit16","maxplus"/), &
996-
specialValueList=(/0,65535,65536,131071/), rc=rc)
995+
specialStringList=(/"max ","high","low ","off "/), &
996+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
997997
if (ESMF_STDERRORCHECK(rc)) return ! bail out
998998

999999
! query Component for its internal State
@@ -1186,15 +1186,15 @@ subroutine SetClock(gcomp, rc)
11861186
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
11871187
if (ESMF_STDERRORCHECK(rc)) return ! bail out
11881188
diagnostic = ESMF_UtilString2Int(value, &
1189-
specialStringList=(/"min","max","bit16","maxplus"/), &
1190-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1189+
specialStringList=(/"max ","high","low ","off "/), &
1190+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
11911191
if (ESMF_STDERRORCHECK(rc)) return ! bail out
11921192
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
11931193
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
11941194
if (ESMF_STDERRORCHECK(rc)) return ! bail out
11951195
verbosity = ESMF_UtilString2Int(value, &
1196-
specialStringList=(/"min","max","bit16","maxplus"/), &
1197-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1196+
specialStringList=(/"max ","high","low ","off "/), &
1197+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
11981198
if (ESMF_STDERRORCHECK(rc)) return ! bail out
11991199

12001200
! query Component for its internal State
@@ -1305,15 +1305,15 @@ subroutine CheckImport(gcomp, rc)
13051305
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
13061306
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13071307
diagnostic = ESMF_UtilString2Int(value, &
1308-
specialStringList=(/"min","max","bit16","maxplus"/), &
1309-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1308+
specialStringList=(/"max ","high","low ","off "/), &
1309+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
13101310
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13111311
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
13121312
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
13131313
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13141314
verbosity = ESMF_UtilString2Int(value, &
1315-
specialStringList=(/"min","max","bit16","maxplus"/), &
1316-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1315+
specialStringList=(/"max ","high","low ","off "/), &
1316+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
13171317
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13181318

13191319
! query Component for its internal State
@@ -1373,15 +1373,15 @@ subroutine ModelAdvance(gcomp, rc)
13731373
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
13741374
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13751375
diagnostic = ESMF_UtilString2Int(value, &
1376-
specialStringList=(/"min","max","bit16","maxplus"/), &
1377-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1376+
specialStringList=(/"max ","high","low ","off "/), &
1377+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
13781378
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13791379
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
13801380
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
13811381
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13821382
verbosity = ESMF_UtilString2Int(value, &
1383-
specialStringList=(/"min","max","bit16","maxplus"/), &
1384-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1383+
specialStringList=(/"max ","high","low ","off "/), &
1384+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
13851385
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13861386

13871387
! query component for its internal State
@@ -1578,15 +1578,15 @@ subroutine ModelFinalize(gcomp,rc)
15781578
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
15791579
if (ESMF_STDERRORCHECK(rc)) return ! bail out
15801580
diagnostic = ESMF_UtilString2Int(value, &
1581-
specialStringList=(/"min","max","bit16","maxplus"/), &
1582-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1581+
specialStringList=(/"max ","high","low ","off "/), &
1582+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
15831583
if (ESMF_STDERRORCHECK(rc)) return ! bail out
15841584
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
15851585
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
15861586
if (ESMF_STDERRORCHECK(rc)) return ! bail out
15871587
verbosity = ESMF_UtilString2Int(value, &
1588-
specialStringList=(/"min","max","bit16","maxplus"/), &
1589-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1588+
specialStringList=(/"max ","high","low ","off "/), &
1589+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
15901590
if (ESMF_STDERRORCHECK(rc)) return ! bail out
15911591

15921592
! query Component for its internal State

‎trunk/NDHMS/CPL/NUOPC_cpl/WRFHydro_NUOPC_Gluecode.F90‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ subroutine wrfhydro_nuopc_ini(did,vm,clock,forcingDir,rc)
147147
call orchestrator%init()
148148

149149
! Set default namelist values
150-
read (startTimeStr(1:4),"(I)") nlst(did)%START_YEAR
151-
read (startTimeStr(6:7),"(I)") nlst(did)%START_MONTH
152-
read (startTimeStr(9:10),"(I)") nlst(did)%START_DAY
153-
read (startTimeStr(12:13),"(I)") nlst(did)%START_HOUR
154-
read (startTimeStr(15:16),"(I)") nlst(did)%START_MIN
150+
read (startTimeStr(1:4),"(I4)") nlst(did)%START_YEAR
151+
read (startTimeStr(6:7),"(I2)") nlst(did)%START_MONTH
152+
read (startTimeStr(9:10),"(I2)") nlst(did)%START_DAY
153+
read (startTimeStr(12:13),"(I2)") nlst(did)%START_HOUR
154+
read (startTimeStr(15:16),"(I2)") nlst(did)%START_MIN
155155
nlst(did)%startdate(1:19) = startTimeStr(1:19)
156156
nlst(did)%olddate(1:19) = startTimeStr(1:19)
157157
nlst(did)%dt = dt
@@ -293,11 +293,11 @@ subroutine wrfhydro_nuopc_ini(did,vm,clock,forcingDir,rc)
293293
#endif
294294

295295
! Override the clock configuration in hyro.namelist
296-
read (startTimeStr(1:4),"(I)") nlst(did)%START_YEAR
297-
read (startTimeStr(6:7),"(I)") nlst(did)%START_MONTH
298-
read (startTimeStr(9:10),"(I)") nlst(did)%START_DAY
299-
read (startTimeStr(12:13),"(I)") nlst(did)%START_HOUR
300-
read (startTimeStr(15:16),"(I)") nlst(did)%START_MIN
296+
read (startTimeStr(1:4),"(I4)") nlst(did)%START_YEAR
297+
read (startTimeStr(6:7),"(I2)") nlst(did)%START_MONTH
298+
read (startTimeStr(9:10),"(I2)") nlst(did)%START_DAY
299+
read (startTimeStr(12:13),"(I2)") nlst(did)%START_HOUR
300+
read (startTimeStr(15:16),"(I2)") nlst(did)%START_MIN
301301
nlst(did)%startdate(1:19) = startTimeStr(1:19)
302302
nlst(did)%olddate(1:19) = startTimeStr(1:19)
303303
nlst(did)%dt = dt

0 commit comments

Comments
 (0)