Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NUOPC cap with GNU support #775

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Update NUOPC cap with GNU support #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
501b6c8
Update NUOPC cap with GNU support
danrosen25 Apr 29, 2021
78cc5d0
Fix noahmp401 min values
danrosen25 May 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions lis/arch/Config.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,9 +834,13 @@

if(defined($ENV{LIS_JPEG})){
$libjpeg = "-L".$ENV{LIS_JPEG}."/lib"." -ljpeg";
$libpath_jpeg = "-L".$ENV{LIS_JPEG}."/lib";
$libflag_jpeg = "-ljpeg";
}
else{
$libjpeg = "-ljpeg";
$libpath_jpeg = "";
$libflag_jpeg = "-ljpeg";
}

# ESMF_TRACE does not prompt user
Expand Down Expand Up @@ -969,8 +973,8 @@
$fflags77 = $fflags77." -I\$(INC_HDF4)";
$fflags = $fflags." -I\$(INC_HDF4)";
$ldflags = $ldflags." -L\$(LIB_HDF4) -lmfhdf -ldf ".$libjpeg." -lz";
$lib_flags= $lib_flags." -lmfhdf -ldf ".$libjpeg." -lz";
$lib_paths= $lib_paths." -L\$(LIB_HDF4)"
$lib_flags= $lib_flags." -lmfhdf -ldf ".$libflag_jpeg." -lz";
$lib_paths= $lib_paths." -L\$(LIB_HDF4) ".$libpath_jpeg
}
if($use_hdf5 == 1){
$fflags77 = $fflags77." -I\$(INC_HDF5)";
Expand Down
64 changes: 32 additions & 32 deletions lis/runmodes/nuopc_cpl_mode/LIS_NUOPC_Cap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -524,15 +524,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
Expand Down Expand Up @@ -734,15 +734,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
Expand Down Expand Up @@ -1015,15 +1015,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
Expand Down Expand Up @@ -1195,15 +1195,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
Expand Down Expand Up @@ -1278,15 +1278,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
Expand Down Expand Up @@ -1346,15 +1346,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
Expand Down Expand Up @@ -1525,15 +1525,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
Expand Down
Loading