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

Jump to bottom

Major fixes to enable EASY coupled model experiments #538

Merged
merged 12 commits into from
Nov 29, 2023
Merged

Major fixes to enable EASY coupled model experiments #538

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
716e003
Since we have not running MOM5 coupled model anymore in > 1-year, to …
Nov 15, 2023
04a4301
attempt to use bcs_shared for coupled experiments-- NOT WORKING as in…
Nov 16, 2023
ee70a6c
Rename COUPLED_shared to shared_COUPLED -- this makes the string uniq…
Nov 21, 2023
9051c71
Merge branch 'develop' into feature/sanAkel/fix_update_coupled-set-up
sanAkel Nov 21, 2023
1f819d1
Use specific mom6 settings
mathomp4 Nov 22, 2023
8fe1388
Add comma
mathomp4 Nov 22, 2023
9613636
Use 458 not 448 for C90
mathomp4 Nov 22, 2023
ac829c6
Add url
mathomp4 Nov 22, 2023
3aff6ce
Update other setup scripts
mathomp4 Nov 27, 2023
966db1e
Merge pull request #542 from GEOS-ESM/feature/mathomp4/specific-mom6
mathomp4 Nov 27, 2023
1e54784
Fix up gmichem_setup
mathomp4 Nov 27, 2023
cecadc5
Fix up non-NCCS scripts
mathomp4 Nov 27, 2023
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
1 change: 1 addition & 0 deletions gcm_CPLFCST360NM2_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1742,6 +1742,7 @@ s?@CLDMICRO?$CLDMICRO?g
s?>>>FORCEDAS<<<?$FORCEDAS?g
s?>>>FORCEGCM<<<?$FORCEGCM?g
s?@COUPLED?$COUPLED?g
s?@shared_COUPLED?$shared_COUPLED?g
s?>>>FORCAST<<<?$FORCAST?g
s?@DATAOCEAN?$DATAOCEAN?g
s?>>>GOCART<<<?$GOCART?g
Expand Down
1 change: 1 addition & 0 deletions gcm_CPLFCST360S2S_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,6 +1736,7 @@ s?@DASTUNING?#?g
s?>>>FORCEDAS<<<?$FORCEDAS?g
s?>>>FORCEGCM<<<?$FORCEGCM?g
s?@COUPLED?$COUPLED?g
s?@shared_COUPLED?$shared_COUPLED?g
s?@CLDMICRO?$CLDMICRO?g
s?>>>FORCAST<<<?$FORCAST?g
s?@DATAOCEAN?$DATAOCEAN?g
Expand Down
2 changes: 1 addition & 1 deletion gcm_forecast.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ setenv EMISSIONS @EMISSIONS
@MOM5setenv ABCSDIR @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM5/@ATMOStag_@OCEANtag
@MOM5setenv OBCSDIR @COUPLEDIR/ocean_bcs/MOM5/${OGCM_IM}x${OGCM_JM}
@MOM6setenv ABCSDIR @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM6/@ATMOStag_@OCEANtag
@MOM6setenv OBCSDIR @COUPLEDIR/ocean_bcs/MOM6/${OGCM_IM}x${OGCM_JM}
@MOM6setenv OBCSDIR @shared_COUPLED/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
@COUPLEDsetenv SSTDIR @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
@COUPLEDsetenv BCTAG `basename $ABCSDIR`
@DATAOCEAN setenv BCTAG `basename $BCSDIR`
Expand Down
4 changes: 2 additions & 2 deletions gcm_run.j
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,9 @@ setenv DATELINE DC
setenv EMISSIONS @EMISSIONS

@MOM5setenv ABCSDIR @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM5/@ATMOStag_@OCEANtag
@MOM5setenv OBCSDIR @COUPLEDIR/ocean_bcs/MOM5/${OGCM_IM}x${OGCM_JM}
@MOM5setenv OBCSDIR @shared_COUPLED/ocean/MOM5/${OGCM_IM}x${OGCM_JM}
@MOM6setenv ABCSDIR @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM6/@ATMOStag_@OCEANtag
@MOM6setenv OBCSDIR @COUPLEDIR/ocean_bcs/MOM6/${OGCM_IM}x${OGCM_JM}
@MOM6setenv OBCSDIR @shared_COUPLED/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
@MOM5setenv SSTDIR @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
@MOM6setenv SSTDIR @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
@MOM5setenv BCTAG `basename $ABCSDIR`
Expand Down
4 changes: 2 additions & 2 deletions gcm_run_benchmark.j
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,9 @@ setenv DATELINE DC
setenv EMISSIONS @EMISSIONS

@MOM5setenv ABCSDIR @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM5/@ATMOStag_@OCEANtag
@MOM5setenv OBCSDIR @COUPLEDIR/ocean_bcs/MOM5/${OGCM_IM}x${OGCM_JM}
@MOM5setenv OBCSDIR @shared_COUPLED/ocean/MOM5/${OGCM_IM}x${OGCM_JM}
@MOM6setenv ABCSDIR @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM6/@ATMOStag_@OCEANtag
@MOM6setenv OBCSDIR @COUPLEDIR/ocean_bcs/MOM6/${OGCM_IM}x${OGCM_JM}
@MOM6setenv OBCSDIR @shared_COUPLED/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
@COUPLEDsetenv SSTDIR @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
@COUPLEDsetenv BCTAG `basename $ABCSDIR`
@DATAOCEANsetenv BCTAG `basename $BCSDIR`
Expand Down
8 changes: 5 additions & 3 deletions gcm_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,14 +614,14 @@ if( $OGCM == TRUE ) then
# Ocean Model
# -----------
OCNMODEL:
echo "Choose an ${C1}Ocean Model${CN}: (Default: ${C2}MOM5${CN})"
echo "Choose an ${C1}Ocean Model${CN}: (Default: ${C2}MOM6${CN})"
echo " ${C2}MOM5${CN}"
echo " ${C2}MOM6${CN}"
echo " ${C2}MIT${CN}"

set OCNMODEL = $<
if ( .$OCNMODEL == . ) then
set OCNMODEL = "MOM5"
set OCNMODEL = "MOM6"
else
set OCNMODEL = `echo $OCNMODEL | tr "[:lower:]" "[:upper:]"`

Expand Down Expand Up @@ -1834,7 +1834,8 @@ else if( $SITE == 'NCCS' ) then
endif
setenv CHMDIR $SHARE/gmao_ops/fvInput_nc3 # locations of Aerosol Chemistry BCs
setenv WRKDIR /discover/nobackup/$LOGNAME # user work directory
setenv COUPLEDIR ${BOUNDARY_DIR}/ssd/aogcm # Coupled Ocean/Atmos Forcing
setenv COUPLEDIR ${BOUNDARY_DIR}/ssd/aogcm # OLD Coupled Ocean/Atmos Forcing
setenv shared_COUPLED ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs # Coupled Ocean/Atmos Forcing
setenv GWDRSDIR ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
if (${OGRIDTYP} == "LL") then
setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR
Expand Down Expand Up @@ -2322,6 +2323,7 @@ s?@ICEFILE?$ICEFILE?g
s?@KPARFILE?$KPARFILE?g
s?@CHMDIR?$CHMDIR?g
s?@COUPLEDIR?$COUPLEDIR?g
s?@shared_COUPLED?$shared_COUPLED?g
s?@GWDRSDIR?$GWDRSDIR?g
s?@EXPDIR?$EXPDIR?g
s?@EXPDSC?$EXPDSC?g
Expand Down
4 changes: 3 additions & 1 deletion geoschemchem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,7 +1864,8 @@ else if( $SITE == 'NCCS' ) then
endif
setenv CHMDIR $SHARE/gmao_ops/fvInput_nc3 # locations of Aerosol Chemistry BCs
setenv WRKDIR /discover/nobackup/$LOGNAME # user work directory
setenv COUPLEDIR ${BOUNDARY_DIR}/ssd/aogcm # Coupled Ocean/Atmos Forcing
setenv COUPLEDIR ${BOUNDARY_DIR}/ssd/aogcm # OLD Coupled Ocean/Atmos Forcing
setenv shared_COUPLED ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs # Coupled Ocean/Atmos Forcing
setenv GWDRSDIR ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
if (${OGRIDTYP} == "LL") then
setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR
Expand Down Expand Up @@ -2389,6 +2390,7 @@ s?@DASTUNING?#?g
s?>>>FORCEDAS<<<?$FORCEDAS?g
s?>>>FORCEGCM<<<?$FORCEGCM?g
s?@COUPLED?$COUPLED?g
s?@shared_COUPLED?$shared_COUPLED?g
s?@CLDMICRO?$CLDMICRO?g
s?@MOM5?$MOM5?g
s?@MOM6?$MOM6?g
Expand Down
4 changes: 3 additions & 1 deletion gmichem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2025,7 +2025,8 @@ else if( $SITE == 'NCCS' ) then
endif
setenv CHMDIR $SHARE/gmao_ops/fvInput_nc3 # locations of Aerosol Chemistry BCs
setenv WRKDIR /discover/nobackup/$LOGNAME # user work directory
setenv COUPLEDIR ${BOUNDARY_DIR}/ssd/aogcm # Coupled Ocean/Atmos Forcing
setenv COUPLEDIR ${BOUNDARY_DIR}/ssd/aogcm # OLD Coupled Ocean/Atmos Forcing
setenv shared_COUPLED ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs # Coupled Ocean/Atmos Forcing
setenv GWDRSDIR ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
if (${OGRIDTYP} == "LL") then
setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR
Expand Down Expand Up @@ -2556,6 +2557,7 @@ s?@DASTUNING?#?g
s?>>>FORCEDAS<<<?$FORCEDAS?g
s?>>>FORCEGCM<<<?$FORCEGCM?g
s?@COUPLED?$COUPLED?g
s?@COUPLED_shared?$COUPLED_shared?g
s?@CLDMICRO?$CLDMICRO?g
s?@MOM5?$MOM5?g
s?@MOM6?$MOM6?g
Expand Down
4 changes: 3 additions & 1 deletion stratchem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1849,7 +1849,8 @@ else if( $SITE == 'NCCS' ) then
endif
setenv CHMDIR $SHARE/gmao_ops/fvInput_nc3 # locations of Aerosol Chemistry BCs
setenv WRKDIR /discover/nobackup/$LOGNAME # user work directory
setenv COUPLEDIR ${BOUNDARY_DIR}/ssd/aogcm # Coupled Ocean/Atmos Forcing
setenv COUPLEDIR ${BOUNDARY_DIR}/ssd/aogcm # OLD Coupled Ocean/Atmos Forcing
setenv shared_COUPLED ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs # Coupled Ocean/Atmos Forcing
setenv GWDRSDIR ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
if (${OGRIDTYP} == "LL") then
setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR
Expand Down Expand Up @@ -2374,6 +2375,7 @@ s?@DASTUNING?#?g
s?>>>FORCEDAS<<<?$FORCEDAS?g
s?>>>FORCEGCM<<<?$FORCEGCM?g
s?@COUPLED?$COUPLED?g
s?@shared_COUPLED?$shared_COUPLED?g
s?@CLDMICRO?$CLDMICRO?g
s?@MOM5?$MOM5?g
s?@MOM6?$MOM6?g
Expand Down