Skip to content

Commit d617930

Browse files
danrosen25danrosen25
committed
Fix NUOPC cap for GNU compilers
1 parent ba02e46 commit d617930

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
@@ -365,15 +365,15 @@ subroutine InitializeP0(gcomp, importState, exportState, clock, rc)
365365
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
366366
if (ESMF_STDERRORCHECK(rc)) return ! bail out
367367
diagnostic = ESMF_UtilString2Int(value, &
368-
specialStringList=(/"min","max","bit16","maxplus"/), &
369-
specialValueList=(/0,65535,65536,131071/), rc=rc)
368+
specialStringList=(/"max ","high","low ","off "/), &
369+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
370370
if (ESMF_STDERRORCHECK(rc)) return ! bail out
371371
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
372372
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
373373
if (ESMF_STDERRORCHECK(rc)) return ! bail out
374374
verbosity = 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, 65281, 8193, 0/), rc=rc)
377377
if (ESMF_STDERRORCHECK(rc)) return ! bail out
378378

379379
! query Component for its internal State
@@ -613,15 +613,15 @@ subroutine InitializeP1(gcomp, importState, exportState, clock, rc)
613613
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
614614
if (ESMF_STDERRORCHECK(rc)) return ! bail out
615615
diagnostic = ESMF_UtilString2Int(value, &
616-
specialStringList=(/"min","max","bit16","maxplus"/), &
617-
specialValueList=(/0,65535,65536,131071/), rc=rc)
616+
specialStringList=(/"max ","high","low ","off "/), &
617+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
618618
if (ESMF_STDERRORCHECK(rc)) return ! bail out
619619
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
620620
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
621621
if (ESMF_STDERRORCHECK(rc)) return ! bail out
622622
verbosity = ESMF_UtilString2Int(value, &
623-
specialStringList=(/"min","max","bit16","maxplus"/), &
624-
specialValueList=(/0,65535,65536,131071/), rc=rc)
623+
specialStringList=(/"max ","high","low ","off "/), &
624+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
625625
if (ESMF_STDERRORCHECK(rc)) return ! bail out
626626

627627
! query Component for its internal State
@@ -769,15 +769,15 @@ subroutine InitializeP3(gcomp, importState, exportState, clock, rc)
769769
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
770770
if (ESMF_STDERRORCHECK(rc)) return ! bail out
771771
diagnostic = ESMF_UtilString2Int(value, &
772-
specialStringList=(/"min","max","bit16","maxplus"/), &
773-
specialValueList=(/0,65535,65536,131071/), rc=rc)
772+
specialStringList=(/"max ","high","low ","off "/), &
773+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
774774
if (ESMF_STDERRORCHECK(rc)) return ! bail out
775775
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
776776
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
777777
if (ESMF_STDERRORCHECK(rc)) return ! bail out
778778
verbosity = ESMF_UtilString2Int(value, &
779-
specialStringList=(/"min","max","bit16","maxplus"/), &
780-
specialValueList=(/0,65535,65536,131071/), rc=rc)
779+
specialStringList=(/"max ","high","low ","off "/), &
780+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
781781
if (ESMF_STDERRORCHECK(rc)) return ! bail out
782782

783783
! query Component for its internal State
@@ -988,15 +988,15 @@ subroutine DataInitialize(gcomp, rc)
988988
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
989989
if (ESMF_STDERRORCHECK(rc)) return ! bail out
990990
diagnostic = ESMF_UtilString2Int(value, &
991-
specialStringList=(/"min","max","bit16","maxplus"/), &
992-
specialValueList=(/0,65535,65536,131071/), rc=rc)
991+
specialStringList=(/"max ","high","low ","off "/), &
992+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
993993
if (ESMF_STDERRORCHECK(rc)) return ! bail out
994994
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
995995
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
996996
if (ESMF_STDERRORCHECK(rc)) return ! bail out
997997
verbosity = ESMF_UtilString2Int(value, &
998-
specialStringList=(/"min","max","bit16","maxplus"/), &
999-
specialValueList=(/0,65535,65536,131071/), rc=rc)
998+
specialStringList=(/"max ","high","low ","off "/), &
999+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
10001000
if (ESMF_STDERRORCHECK(rc)) return ! bail out
10011001

10021002
! query Component for its internal State
@@ -1139,15 +1139,15 @@ subroutine SetClock(gcomp, rc)
11391139
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
11401140
if (ESMF_STDERRORCHECK(rc)) return ! bail out
11411141
diagnostic = ESMF_UtilString2Int(value, &
1142-
specialStringList=(/"min","max","bit16","maxplus"/), &
1143-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1142+
specialStringList=(/"max ","high","low ","off "/), &
1143+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
11441144
if (ESMF_STDERRORCHECK(rc)) return ! bail out
11451145
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
11461146
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
11471147
if (ESMF_STDERRORCHECK(rc)) return ! bail out
11481148
verbosity = ESMF_UtilString2Int(value, &
1149-
specialStringList=(/"min","max","bit16","maxplus"/), &
1150-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1149+
specialStringList=(/"max ","high","low ","off "/), &
1150+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
11511151
if (ESMF_STDERRORCHECK(rc)) return ! bail out
11521152

11531153
! query Component for its internal State
@@ -1258,15 +1258,15 @@ subroutine CheckImport(gcomp, rc)
12581258
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
12591259
if (ESMF_STDERRORCHECK(rc)) return ! bail out
12601260
diagnostic = ESMF_UtilString2Int(value, &
1261-
specialStringList=(/"min","max","bit16","maxplus"/), &
1262-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1261+
specialStringList=(/"max ","high","low ","off "/), &
1262+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
12631263
if (ESMF_STDERRORCHECK(rc)) return ! bail out
12641264
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
12651265
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
12661266
if (ESMF_STDERRORCHECK(rc)) return ! bail out
12671267
verbosity = ESMF_UtilString2Int(value, &
1268-
specialStringList=(/"min","max","bit16","maxplus"/), &
1269-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1268+
specialStringList=(/"max ","high","low ","off "/), &
1269+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
12701270
if (ESMF_STDERRORCHECK(rc)) return ! bail out
12711271

12721272
! query Component for its internal State
@@ -1325,15 +1325,15 @@ subroutine ModelAdvance(gcomp, rc)
13251325
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
13261326
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13271327
diagnostic = ESMF_UtilString2Int(value, &
1328-
specialStringList=(/"min","max","bit16","maxplus"/), &
1329-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1328+
specialStringList=(/"max ","high","low ","off "/), &
1329+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
13301330
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13311331
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
13321332
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
13331333
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13341334
verbosity = ESMF_UtilString2Int(value, &
1335-
specialStringList=(/"min","max","bit16","maxplus"/), &
1336-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1335+
specialStringList=(/"max ","high","low ","off "/), &
1336+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
13371337
if (ESMF_STDERRORCHECK(rc)) return ! bail out
13381338

13391339
! query component for its internal State
@@ -1485,15 +1485,15 @@ subroutine ModelFinalize(gcomp,rc)
14851485
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
14861486
if (ESMF_STDERRORCHECK(rc)) return ! bail out
14871487
diagnostic = ESMF_UtilString2Int(value, &
1488-
specialStringList=(/"min","max","bit16","maxplus"/), &
1489-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1488+
specialStringList=(/"max ","high","low ","off "/), &
1489+
specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc)
14901490
if (ESMF_STDERRORCHECK(rc)) return ! bail out
14911491
call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, &
14921492
defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc)
14931493
if (ESMF_STDERRORCHECK(rc)) return ! bail out
14941494
verbosity = ESMF_UtilString2Int(value, &
1495-
specialStringList=(/"min","max","bit16","maxplus"/), &
1496-
specialValueList=(/0,65535,65536,131071/), rc=rc)
1495+
specialStringList=(/"max ","high","low ","off "/), &
1496+
specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc)
14971497
if (ESMF_STDERRORCHECK(rc)) return ! bail out
14981498

14991499
! 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
@@ -315,11 +315,11 @@ subroutine wrfhydro_nuopc_ini(did,vm,clock,forcingDir,rc)
315315
call orchestrator%init()
316316

317317
! Set default namelist values
318-
read (startTimeStr(1:4),"(I)") nlst(did)%START_YEAR
319-
read (startTimeStr(6:7),"(I)") nlst(did)%START_MONTH
320-
read (startTimeStr(9:10),"(I)") nlst(did)%START_DAY
321-
read (startTimeStr(12:13),"(I)") nlst(did)%START_HOUR
322-
read (startTimeStr(15:16),"(I)") nlst(did)%START_MIN
318+
read (startTimeStr(1:4),"(I4)") nlst(did)%START_YEAR
319+
read (startTimeStr(6:7),"(I2)") nlst(did)%START_MONTH
320+
read (startTimeStr(9:10),"(I2)") nlst(did)%START_DAY
321+
read (startTimeStr(12:13),"(I2)") nlst(did)%START_HOUR
322+
read (startTimeStr(15:16),"(I2)") nlst(did)%START_MIN
323323
nlst(did)%startdate(1:19) = startTimeStr(1:19)
324324
nlst(did)%olddate(1:19) = startTimeStr(1:19)
325325
nlst(did)%dt = dt
@@ -461,11 +461,11 @@ subroutine wrfhydro_nuopc_ini(did,vm,clock,forcingDir,rc)
461461
#endif
462462

463463
! Override the clock configuration in hyro.namelist
464-
read (startTimeStr(1:4),"(I)") nlst(did)%START_YEAR
465-
read (startTimeStr(6:7),"(I)") nlst(did)%START_MONTH
466-
read (startTimeStr(9:10),"(I)") nlst(did)%START_DAY
467-
read (startTimeStr(12:13),"(I)") nlst(did)%START_HOUR
468-
read (startTimeStr(15:16),"(I)") nlst(did)%START_MIN
464+
read (startTimeStr(1:4),"(I4)") nlst(did)%START_YEAR
465+
read (startTimeStr(6:7),"(I2)") nlst(did)%START_MONTH
466+
read (startTimeStr(9:10),"(I2)") nlst(did)%START_DAY
467+
read (startTimeStr(12:13),"(I2)") nlst(did)%START_HOUR
468+
read (startTimeStr(15:16),"(I2)") nlst(did)%START_MIN
469469
nlst(did)%startdate(1:19) = startTimeStr(1:19)
470470
nlst(did)%olddate(1:19) = startTimeStr(1:19)
471471
nlst(did)%dt = dt

0 commit comments

Comments
 (0)