From d617930f8a8c7efdebb55977f8a6bfc0bfd158f8 Mon Sep 17 00:00:00 2001 From: Dan Rosen Date: Tue, 27 Apr 2021 23:50:59 -0400 Subject: [PATCH] Fix NUOPC cap for GNU compilers --- .../CPL/NUOPC_cpl/WRFHydro_NUOPC_Cap.F90 | 64 +++++++++---------- .../CPL/NUOPC_cpl/WRFHydro_NUOPC_Gluecode.F90 | 20 +++--- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/trunk/NDHMS/CPL/NUOPC_cpl/WRFHydro_NUOPC_Cap.F90 b/trunk/NDHMS/CPL/NUOPC_cpl/WRFHydro_NUOPC_Cap.F90 index 6727b6596..95fa35944 100644 --- a/trunk/NDHMS/CPL/NUOPC_cpl/WRFHydro_NUOPC_Cap.F90 +++ b/trunk/NDHMS/CPL/NUOPC_cpl/WRFHydro_NUOPC_Cap.F90 @@ -365,15 +365,15 @@ subroutine InitializeP0(gcomp, importState, exportState, clock, rc) defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out diagnostic = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, & defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out verbosity = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out ! query Component for its internal State @@ -613,15 +613,15 @@ subroutine InitializeP1(gcomp, importState, exportState, clock, rc) defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out diagnostic = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, & defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out verbosity = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out ! query Component for its internal State @@ -769,15 +769,15 @@ subroutine InitializeP3(gcomp, importState, exportState, clock, rc) defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out diagnostic = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, & defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out verbosity = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out ! query Component for its internal State @@ -988,15 +988,15 @@ subroutine DataInitialize(gcomp, rc) defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out diagnostic = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, & defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out verbosity = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out ! query Component for its internal State @@ -1139,15 +1139,15 @@ subroutine SetClock(gcomp, rc) defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out diagnostic = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, & defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out verbosity = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out ! query Component for its internal State @@ -1258,15 +1258,15 @@ subroutine CheckImport(gcomp, rc) defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out diagnostic = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, & defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out verbosity = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out ! query Component for its internal State @@ -1325,15 +1325,15 @@ subroutine ModelAdvance(gcomp, rc) defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out diagnostic = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, & defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out verbosity = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out ! query component for its internal State @@ -1485,15 +1485,15 @@ subroutine ModelFinalize(gcomp,rc) defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out diagnostic = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65535, 65535, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out call ESMF_AttributeGet(gcomp, name="Verbosity", value=value, & defaultValue="0", convention="NUOPC", purpose="Instance", rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out verbosity = ESMF_UtilString2Int(value, & - specialStringList=(/"min","max","bit16","maxplus"/), & - specialValueList=(/0,65535,65536,131071/), rc=rc) + specialStringList=(/"max ","high","low ","off "/), & + specialValueList= (/ 65535, 65281, 8193, 0/), rc=rc) if (ESMF_STDERRORCHECK(rc)) return ! bail out ! query Component for its internal State diff --git a/trunk/NDHMS/CPL/NUOPC_cpl/WRFHydro_NUOPC_Gluecode.F90 b/trunk/NDHMS/CPL/NUOPC_cpl/WRFHydro_NUOPC_Gluecode.F90 index d9b1a5515..4e5a5bc54 100644 --- a/trunk/NDHMS/CPL/NUOPC_cpl/WRFHydro_NUOPC_Gluecode.F90 +++ b/trunk/NDHMS/CPL/NUOPC_cpl/WRFHydro_NUOPC_Gluecode.F90 @@ -315,11 +315,11 @@ subroutine wrfhydro_nuopc_ini(did,vm,clock,forcingDir,rc) call orchestrator%init() ! Set default namelist values - read (startTimeStr(1:4),"(I)") nlst(did)%START_YEAR - read (startTimeStr(6:7),"(I)") nlst(did)%START_MONTH - read (startTimeStr(9:10),"(I)") nlst(did)%START_DAY - read (startTimeStr(12:13),"(I)") nlst(did)%START_HOUR - read (startTimeStr(15:16),"(I)") nlst(did)%START_MIN + read (startTimeStr(1:4),"(I4)") nlst(did)%START_YEAR + read (startTimeStr(6:7),"(I2)") nlst(did)%START_MONTH + read (startTimeStr(9:10),"(I2)") nlst(did)%START_DAY + read (startTimeStr(12:13),"(I2)") nlst(did)%START_HOUR + read (startTimeStr(15:16),"(I2)") nlst(did)%START_MIN nlst(did)%startdate(1:19) = startTimeStr(1:19) nlst(did)%olddate(1:19) = startTimeStr(1:19) nlst(did)%dt = dt @@ -461,11 +461,11 @@ subroutine wrfhydro_nuopc_ini(did,vm,clock,forcingDir,rc) #endif ! Override the clock configuration in hyro.namelist - read (startTimeStr(1:4),"(I)") nlst(did)%START_YEAR - read (startTimeStr(6:7),"(I)") nlst(did)%START_MONTH - read (startTimeStr(9:10),"(I)") nlst(did)%START_DAY - read (startTimeStr(12:13),"(I)") nlst(did)%START_HOUR - read (startTimeStr(15:16),"(I)") nlst(did)%START_MIN + read (startTimeStr(1:4),"(I4)") nlst(did)%START_YEAR + read (startTimeStr(6:7),"(I2)") nlst(did)%START_MONTH + read (startTimeStr(9:10),"(I2)") nlst(did)%START_DAY + read (startTimeStr(12:13),"(I2)") nlst(did)%START_HOUR + read (startTimeStr(15:16),"(I2)") nlst(did)%START_MIN nlst(did)%startdate(1:19) = startTimeStr(1:19) nlst(did)%olddate(1:19) = startTimeStr(1:19) nlst(did)%dt = dt