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

v12: Fixes #653. Update default ocean to CS for C90+ #661

Merged
merged 4 commits into from
Dec 13, 2024
Merged

v12: Fixes #653. Update default ocean to CS for C90+ #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d633f6
Fixes #653. Update default ocean to CS for C90+
mathomp4 Nov 7, 2024
f159276
Add dates for Reynolds
mathomp4 Nov 7, 2024
85ca2cc
Do default split in gmichem_setup
mathomp4 Nov 7, 2024
e630c45
Add braces
mathomp4 Nov 7, 2024
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
66 changes: 42 additions & 24 deletions gcm_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,12 +819,31 @@ else
# OGCM = FALSE (Data Ocean Resolution)
# ------------------------------------
DORSLV:
echo "Enter the ${C1}Data_Ocean Horizontal Resolution ${CN}code: ${C2}o1${CN} (1 -deg, 360x180 Reynolds) Default"

# We have two different default ocean resolutions based on the atmospheric resolution
# if LOW_ATM_RES is TRUE, we use o1 (Reynolds) as the default
# if LOW_ATM_RES is FALSE, we use CS (Cubed-Sphere OSTIA) as the default

if( $LOW_ATM_RES == 'TRUE') then
set DEFAULT_HRCODE = 'o1'
set O1_DEFAULT = ' (Default)'
set CS_DEFAULT = ''
else
set DEFAULT_HRCODE = 'CS'
set O1_DEFAULT = ''
set CS_DEFAULT = ' (Default)'
set DEFAULT_HRCODE = 'CS'
endif
echo "Enter the ${C1}Data_Ocean Horizontal Resolution ${CN}code: ${C2}o1${CN} (1 -deg, 360x180 Reynolds)${O1_DEFAULT}"
echo " ${C2}o2${CN} (1/4-deg, 1440x720 MERRA-2)"
echo " ${C2}o3${CN} (1/8-deg, 2880x1440 OSTIA)"
echo " ${C2}CS${CN} (Cubed-Sphere OSTIA)"
echo " ${C2}CS${CN} (Cubed-Sphere OSTIA)${CS_DEFAULT}"
# We also note that the Reynolds ocean does not exist past 2022
echo ""
echo "NOTE: The Reynolds ocean resolution is only available up to 2022"

set HRCODE = `echo $<`
if( .$HRCODE == . ) set HRCODE = o1
if( .$HRCODE == . ) set HRCODE = $DEFAULT_HRCODE
set HRCODE = `echo $HRCODE | tr "[:upper:]" "[:lower:]"`

if( $HRCODE != 'o1' & \
Expand Down Expand Up @@ -886,30 +905,29 @@ else
set DATAOCEAN = ""
endif
if( $HRCODE == 'cs' ) then
if( $LOW_ATM_RES == 'FALSE') then
set OGCM_IM = `echo $AGCM_IM | cut -b2-`
set OGCM_JM = `expr $OGCM_IM \* 6`
set Resolution = `echo $OGCM_IM $OGCM_JM`
set OGCM_IM = $Resolution[1]
set OGCM_JM = $Resolution[2]
set OGCM_GRID_TYPE = Cubed-Sphere
set OGCM_NF = 6
set LATLON_OGCM = "#DELETE"
set CUBE_OGCM = ""
set DATAOCEAN = "#DELETE"

set OCEAN_TAG = Ostia
set SSTNAME = OSTIA_REYNOLDS
set OCEANOUT = "CS"
set SSTFILE = dataoceanfile_OSTIA_REYNOLDS_SST.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set ICEFILE = dataoceanfile_OSTIA_REYNOLDS_ICE.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set KPARFILE = SEAWIFS_KPAR_mon_clim.${OGCM_IM}x${OGCM_JM}
set OGRIDTYP = "CF"
set OSTIA = ""
else
if( $LOW_ATM_RES == 'TRUE') then
echo "Error: Cubed-Sphere Ocean with ${AGCM_IM} not currently supported. Must be c90 or higher"
exit 7
endif
set OGCM_IM = `echo $AGCM_IM | cut -b2-`
set OGCM_JM = `expr $OGCM_IM \* 6`
set Resolution = `echo $OGCM_IM $OGCM_JM`
set OGCM_IM = $Resolution[1]
set OGCM_JM = $Resolution[2]
set OGCM_GRID_TYPE = Cubed-Sphere
set OGCM_NF = 6
set LATLON_OGCM = "#DELETE"
set CUBE_OGCM = ""
set DATAOCEAN = "#DELETE"

set OCEAN_TAG = Ostia
set SSTNAME = OSTIA_REYNOLDS
set OCEANOUT = "CS"
set SSTFILE = dataoceanfile_OSTIA_REYNOLDS_SST.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set ICEFILE = dataoceanfile_OSTIA_REYNOLDS_ICE.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set KPARFILE = SEAWIFS_KPAR_mon_clim.${OGCM_IM}x${OGCM_JM}
set OGRIDTYP = "CF"
set OSTIA = ""
endif

set IMO = ${OGCM_IM}
Expand Down
70 changes: 44 additions & 26 deletions geoschemchem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ endif
# Build Directory Locations
#######################################################################

# Set Current Working Path to gcm_setup
# -------------------------------------
# Set Current Working Path to geoschemchem_setup
# ----------------------------------------------
setenv ARCH `uname -s`
setenv NODE `uname -n`

Expand Down Expand Up @@ -819,12 +819,31 @@ else
# OGCM = FALSE (Data Ocean Resolution)
# ------------------------------------
DORSLV:
echo "Enter the ${C1}Data_Ocean Horizontal Resolution ${CN}code: ${C2}o1${CN} (1 -deg, 360x180 Reynolds) Default"

# We have two different default ocean resolutions based on the atmospheric resolution
# if LOW_ATM_RES is TRUE, we use o1 (Reynolds) as the default
# if LOW_ATM_RES is FALSE, we use CS (Cubed-Sphere OSTIA) as the default

if( $LOW_ATM_RES == 'TRUE') then
set DEFAULT_HRCODE = 'o1'
set O1_DEFAULT = ' (Default)'
set CS_DEFAULT = ''
else
set DEFAULT_HRCODE = 'CS'
set O1_DEFAULT = ''
set CS_DEFAULT = ' (Default)'
set DEFAULT_HRCODE = 'CS'
endif
echo "Enter the ${C1}Data_Ocean Horizontal Resolution ${CN}code: ${C2}o1${CN} (1 -deg, 360x180 Reynolds)${O1_DEFAULT}"
echo " ${C2}o2${CN} (1/4-deg, 1440x720 MERRA-2)"
echo " ${C2}o3${CN} (1/8-deg, 2880x1440 OSTIA)"
echo " ${C2}CS${CN} (Cubed-Sphere OSTIA)"
echo " ${C2}CS${CN} (Cubed-Sphere OSTIA)${CS_DEFAULT}"
# We also note that the Reynolds ocean does not exist past 2022
echo ""
echo "NOTE: The Reynolds ocean resolution is only available up to 2022"

set HRCODE = `echo $<`
if( .$HRCODE == . ) set HRCODE = o1
if( .$HRCODE == . ) set HRCODE = $DEFAULT_HRCODE
set HRCODE = `echo $HRCODE | tr "[:upper:]" "[:lower:]"`

if( $HRCODE != 'o1' & \
Expand Down Expand Up @@ -886,30 +905,29 @@ else
set DATAOCEAN = ""
endif
if( $HRCODE == 'cs' ) then
if( $LOW_ATM_RES == 'FALSE') then
set OGCM_IM = `echo $AGCM_IM | cut -b2-`
set OGCM_JM = `expr $OGCM_IM \* 6`
set Resolution = `echo $OGCM_IM $OGCM_JM`
set OGCM_IM = $Resolution[1]
set OGCM_JM = $Resolution[2]
set OGCM_GRID_TYPE = Cubed-Sphere
set OGCM_NF = 6
set LATLON_OGCM = "#DELETE"
set CUBE_OGCM = ""
set DATAOCEAN = "#DELETE"

set OCEAN_TAG = Ostia
set SSTNAME = OSTIA_REYNOLDS
set OCEANOUT = "CS"
set SSTFILE = dataoceanfile_OSTIA_REYNOLDS_SST.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set ICEFILE = dataoceanfile_OSTIA_REYNOLDS_ICE.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set KPARFILE = SEAWIFS_KPAR_mon_clim.${OGCM_IM}x${OGCM_JM}
set OGRIDTYP = "CF"
set OSTIA = ""
else
if( $LOW_ATM_RES == 'TRUE') then
echo "Error: Cubed-Sphere Ocean with ${AGCM_IM} not currently supported. Must be c90 or higher"
exit 7
endif
set OGCM_IM = `echo $AGCM_IM | cut -b2-`
set OGCM_JM = `expr $OGCM_IM \* 6`
set Resolution = `echo $OGCM_IM $OGCM_JM`
set OGCM_IM = $Resolution[1]
set OGCM_JM = $Resolution[2]
set OGCM_GRID_TYPE = Cubed-Sphere
set OGCM_NF = 6
set LATLON_OGCM = "#DELETE"
set CUBE_OGCM = ""
set DATAOCEAN = "#DELETE"

set OCEAN_TAG = Ostia
set SSTNAME = OSTIA_REYNOLDS
set OCEANOUT = "CS"
set SSTFILE = dataoceanfile_OSTIA_REYNOLDS_SST.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set ICEFILE = dataoceanfile_OSTIA_REYNOLDS_ICE.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set KPARFILE = SEAWIFS_KPAR_mon_clim.${OGCM_IM}x${OGCM_JM}
set OGRIDTYP = "CF"
set OSTIA = ""
endif

set IMO = ${OGCM_IM}
Expand Down
63 changes: 39 additions & 24 deletions gmichem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,21 +819,37 @@ else
# OGCM = FALSE (Data Ocean Resolution)
# ------------------------------------
DORSLV:

# We have two different default ocean resolutions based on the atmospheric resolution
# if LOW_ATM_RES is TRUE, we use o1 (Reynolds) as the default
# if LOW_ATM_RES is FALSE, we use CS (Cubed-Sphere OSTIA) as the default

if( $LOW_ATM_RES == 'TRUE') then
set DEFAULT_HRCODE = 'o1'
set O1_DEFAULT = ' (Default)'
set CS_DEFAULT = ''
else
set DEFAULT_HRCODE = 'CS'
set O1_DEFAULT = ''
set CS_DEFAULT = ' (Default)'
set DEFAULT_HRCODE = 'CS'
endif

echo
echo "------------------------------------------------"
echo "Enter the ${C1}Data_Ocean Horizontal Resolution ${CN}code:"
echo "------------------------------------------------"
echo " ${C2}o1${CN} 1 -deg, 360x 180 Reynolds (Default)"
echo " ${C2}o1${CN} 1 -deg, 360x 180 Reynolds (1971-2022)${O1_DEFAULT}"
echo " ${C2}o2${CN} 1/4-deg, 1440x 720 MERRA-2"
echo " ${C2}o3${CN} 1/8-deg, 2880x1440 OSTIA"
echo " ${C2}o4${CN} 1 -deg, 360x 180 Hadley (1949-2006)"
echo " ${C2}o5${CN} 1 -deg, 360x 180 CCSM_4.0 (1850-2005)"
echo " ${C2}o6${CN} 1 -deg, 360x 180 CCSM_4.0 (2006-2100)"
echo " ${C2}o7${CN} 1 -deg, 360x 180 HadISST (1870-2020)"
echo " ${C2}CS${CN} Cubed-Sphere OSTIA"
echo " ${C2}CS${CN} Cubed-Sphere OSTIA${CS_DEFAULT}"
echo "------------------------------------------------"
set HRCODE = `echo $<`
if( .$HRCODE == . ) set HRCODE = o1
if( .$HRCODE == . ) set HRCODE = $DEFAULT_HRCODE
set HRCODE = `echo $HRCODE | tr "[:upper:]" "[:lower:]"`

if( $HRCODE != 'o1' & \
Expand Down Expand Up @@ -978,30 +994,29 @@ else
set DATAOCEAN = ""
endif
if( $HRCODE == 'cs' ) then
if( $LOW_ATM_RES == 'FALSE') then
set OGCM_IM = `echo $AGCM_IM | cut -b2-`
set OGCM_JM = `expr $OGCM_IM \* 6`
set Resolution = `echo $OGCM_IM $OGCM_JM`
set OGCM_IM = $Resolution[1]
set OGCM_JM = $Resolution[2]
set OGCM_GRID_TYPE = Cubed-Sphere
set OGCM_NF = 6
set LATLON_OGCM = "#DELETE"
set CUBE_OGCM = ""
set DATAOCEAN = "#DELETE"

set OCEAN_TAG = Ostia
set SSTNAME = OSTIA_REYNOLDS
set OCEANOUT = "CS"
set SSTFILE = dataoceanfile_OSTIA_REYNOLDS_SST.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set ICEFILE = dataoceanfile_OSTIA_REYNOLDS_ICE.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set KPARFILE = SEAWIFS_KPAR_mon_clim.${OGCM_IM}x${OGCM_JM}
set OGRIDTYP = "CF"
set OSTIA = ""
else
if( $LOW_ATM_RES == 'TRUE') then
echo "Error: Cubed-Sphere Ocean with ${AGCM_IM} not currently supported. Must be c90 or higher"
exit 7
endif
set OGCM_IM = `echo $AGCM_IM | cut -b2-`
set OGCM_JM = `expr $OGCM_IM \* 6`
set Resolution = `echo $OGCM_IM $OGCM_JM`
set OGCM_IM = $Resolution[1]
set OGCM_JM = $Resolution[2]
set OGCM_GRID_TYPE = Cubed-Sphere
set OGCM_NF = 6
set LATLON_OGCM = "#DELETE"
set CUBE_OGCM = ""
set DATAOCEAN = "#DELETE"

set OCEAN_TAG = Ostia
set SSTNAME = OSTIA_REYNOLDS
set OCEANOUT = "CS"
set SSTFILE = dataoceanfile_OSTIA_REYNOLDS_SST.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set ICEFILE = dataoceanfile_OSTIA_REYNOLDS_ICE.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set KPARFILE = SEAWIFS_KPAR_mon_clim.${OGCM_IM}x${OGCM_JM}
set OGRIDTYP = "CF"
set OSTIA = ""
endif

set IMO = ${OGCM_IM}
Expand Down
70 changes: 44 additions & 26 deletions stratchem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ endif
# Build Directory Locations
#######################################################################

# Set Current Working Path to gcm_setup
# -------------------------------------
# Set Current Working Path to stratchem_setup
# -------------------------------------------
setenv ARCH `uname -s`
setenv NODE `uname -n`

Expand Down Expand Up @@ -819,12 +819,31 @@ else
# OGCM = FALSE (Data Ocean Resolution)
# ------------------------------------
DORSLV:
echo "Enter the ${C1}Data_Ocean Horizontal Resolution ${CN}code: ${C2}o1${CN} (1 -deg, 360x180 Reynolds) Default"

# We have two different default ocean resolutions based on the atmospheric resolution
# if LOW_ATM_RES is TRUE, we use o1 (Reynolds) as the default
# if LOW_ATM_RES is FALSE, we use CS (Cubed-Sphere OSTIA) as the default

if( $LOW_ATM_RES == 'TRUE') then
set DEFAULT_HRCODE = 'o1'
set O1_DEFAULT = ' (Default)'
set CS_DEFAULT = ''
else
set DEFAULT_HRCODE = 'CS'
set O1_DEFAULT = ''
set CS_DEFAULT = ' (Default)'
set DEFAULT_HRCODE = 'CS'
endif
echo "Enter the ${C1}Data_Ocean Horizontal Resolution ${CN}code: ${C2}o1${CN} (1 -deg, 360x180 Reynolds)${O1_DEFAULT}"
echo " ${C2}o2${CN} (1/4-deg, 1440x720 MERRA-2)"
echo " ${C2}o3${CN} (1/8-deg, 2880x1440 OSTIA)"
echo " ${C2}CS${CN} (Cubed-Sphere OSTIA)"
echo " ${C2}CS${CN} (Cubed-Sphere OSTIA)${CS_DEFAULT}"
# We also note that the Reynolds ocean does not exist past 2022
echo ""
echo "NOTE: The Reynolds ocean resolution is only available up to 2022"

set HRCODE = `echo $<`
if( .$HRCODE == . ) set HRCODE = o1
if( .$HRCODE == . ) set HRCODE = $DEFAULT_HRCODE
set HRCODE = `echo $HRCODE | tr "[:upper:]" "[:lower:]"`

if( $HRCODE != 'o1' & \
Expand Down Expand Up @@ -886,30 +905,29 @@ else
set DATAOCEAN = ""
endif
if( $HRCODE == 'cs' ) then
if( $LOW_ATM_RES == 'FALSE') then
set OGCM_IM = `echo $AGCM_IM | cut -b2-`
set OGCM_JM = `expr $OGCM_IM \* 6`
set Resolution = `echo $OGCM_IM $OGCM_JM`
set OGCM_IM = $Resolution[1]
set OGCM_JM = $Resolution[2]
set OGCM_GRID_TYPE = Cubed-Sphere
set OGCM_NF = 6
set LATLON_OGCM = "#DELETE"
set CUBE_OGCM = ""
set DATAOCEAN = "#DELETE"

set OCEAN_TAG = Ostia
set SSTNAME = OSTIA_REYNOLDS
set OCEANOUT = "CS"
set SSTFILE = dataoceanfile_OSTIA_REYNOLDS_SST.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set ICEFILE = dataoceanfile_OSTIA_REYNOLDS_ICE.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set KPARFILE = SEAWIFS_KPAR_mon_clim.${OGCM_IM}x${OGCM_JM}
set OGRIDTYP = "CF"
set OSTIA = ""
else
if( $LOW_ATM_RES == 'TRUE') then
echo "Error: Cubed-Sphere Ocean with ${AGCM_IM} not currently supported. Must be c90 or higher"
exit 7
endif
set OGCM_IM = `echo $AGCM_IM | cut -b2-`
set OGCM_JM = `expr $OGCM_IM \* 6`
set Resolution = `echo $OGCM_IM $OGCM_JM`
set OGCM_IM = $Resolution[1]
set OGCM_JM = $Resolution[2]
set OGCM_GRID_TYPE = Cubed-Sphere
set OGCM_NF = 6
set LATLON_OGCM = "#DELETE"
set CUBE_OGCM = ""
set DATAOCEAN = "#DELETE"

set OCEAN_TAG = Ostia
set SSTNAME = OSTIA_REYNOLDS
set OCEANOUT = "CS"
set SSTFILE = dataoceanfile_OSTIA_REYNOLDS_SST.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set ICEFILE = dataoceanfile_OSTIA_REYNOLDS_ICE.${OGCM_IM}x${OGCM_JM}.\${YEAR}.data
set KPARFILE = SEAWIFS_KPAR_mon_clim.${OGCM_IM}x${OGCM_JM}
set OGRIDTYP = "CF"
set OSTIA = ""
endif

set IMO = ${OGCM_IM}
Expand Down
Loading