Skip to content

Merge v12 latest into gcm_scripts branch #851

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

Open
mathomp4 wants to merge 24 commits into
base: feature/gcm_scripts
Choose a base branch
from
Open

Merge v12 latest into gcm_scripts branch #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
211cd06
v12: Remove saltwater splitting
mathomp4 Jan 29, 2026
d6e5adc
v12: More updates to make L72 like v11
mathomp4 Mar 18, 2026
9a3e426
Fix bug
mathomp4 Mar 23, 2026
888f566
Restore L72 default to use legacy GF. Add 10m wind speed to history
sdrabenh Mar 27, 2026
5459601
Merge pull request #827 from GEOS-ESM/feature/sdrabenh/hist_and_L72_u…
sdrabenh Mar 27, 2026
265d595
Merge branch 'feature/sdrabenh/gcm_v12' into feature/v12-l72-is-v11-l…
sdrabenh Mar 27, 2026
04ecc78
Merge pull request #824 from GEOS-ESM/feature/v12-l72-is-v11-like-part2
sdrabenh Mar 27, 2026
ddb7a3e
Merge branch 'feature/sdrabenh/gcm_v12' into feature/v12-remove-salt-…
mathomp4 Apr 7, 2026
50370a9
Merge pull request #800 from GEOS-ESM/feature/v12-remove-salt-splitting
sdrabenh Apr 9, 2026
4800a84
Update SLURM resource request for gcm_plot.j
sdrabenh Apr 9, 2026
16db3a3
Update SLURM resource request for gcm_plot.j for other setups
sdrabenh Apr 9, 2026
8993cdf
Add else case for PLOT_P
sdrabenh Apr 9, 2026
6cf8d61
removed BACM_1M options that are defaults in MoistGC
wmputman Apr 14, 2026
69484a9
Merge pull request #829 from GEOS-ESM/feature/sdrabenh/modify_plots_c…
sdrabenh Apr 14, 2026
d8ef6f4
Add push_to_v12 action
mathomp4 Apr 14, 2026
328c186
Fix push to develop action
mathomp4 Apr 14, 2026
c933eb8
Fix push to v12 action
mathomp4 Apr 14, 2026
8d606a8
Merge remote-tracking branch 'origin/feature/wmputman/LM_v12rc28p' in…
sdrabenh Apr 15, 2026
19dcde0
alias nitrate bins in AGCM HISTORY
acollow Apr 16, 2026
6c0cdd0
Merge pull request #833 from GEOS-ESM/feature/acollow/nitratebinhistory
sdrabenh Apr 16, 2026
6e9be99
merge develop into feature/sdrabenh/gcm_v12
sdrabenh Apr 17, 2026
6e921cc
Update spack CI
mathomp4 May 1, 2026
9213ec9
Merge branch 'feature/sdrabenh/gcm_v12' into feature/sshakoor/gcmpy
mathomp4 May 4, 2026
80f64d0
Merge branch 'feature/sshakoor/gcmpy' into feature/gcm_scripts
mathomp4 May 4, 2026
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
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## :memo: Automatic PR: `develop` → `release/MAPL-v3`
## :memo: Automatic PR: `v12` → `release/MAPL-v3`

### Description

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/push-to-develop.yml → .github/workflows/push-to-v12.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Push to Develop
name: Push to v12

on:
push:
branches:
- develop
- feature/sdrabenh/gcm_v12

jobs:
pull_request:
Expand All @@ -19,13 +19,13 @@ jobs:
uses: devops-infra/action-pull-request@v0.5.5
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: develop
source_branch: feature/sdrabenh/gcm_v12
target_branch: release/MAPL-v3
label: automatic,MAPL3,Skip Changelog
template: .github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
get_diff: true
assignee: ${{ github.actor }}
old_string: "<!-- Write your description here -->"
new_string: ${{ github.event.commits[0].message }}
title: Auto PR - develop → MAPL-v3 - ${{ github.event.commits[0].message }}
title: Auto PR - v12 → MAPL-v3 - ${{ github.event.commits[0].message }}

2 changes: 2 additions & 0 deletions .github/workflows/workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ concurrency:
jobs:
build_gcm:
strategy:
fail-fast: false
matrix:
compiler: [ifort, gfortran-14, gfortran-15]
build-type: [Debug]
Expand All @@ -36,4 +37,5 @@ jobs:
with:
fixture-repo: GEOS-ESM/GEOSgcm
fixture-ref: feature/sdrabenh/gcm_v12
load-fms: true

6 changes: 0 additions & 6 deletions AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ SHALLOW_OPTION: UW
# convection scheme options
# ----------------------------------------
CONVPAR_OPTION: {{ CONVPAR_OPTION }}
{{ BACM_1M_ }}USE_GF2020: 0
# Convective plumes to be activated (1 true, 0 false)
DEEP: 1
SHALLOW: 0
Expand All @@ -134,11 +133,6 @@ NCAR_NRDG: {{ NCAR_NRDG }}
# The below settings are only for v14 BCs currently being tested
#v14 NCAR_EFFGWORO: 0.35
#v14 NCAR_ORO_TNDMAX: 250

# For BACM_1M we revert to v11 TURB settings
{{ BACM_1M_ }}TURBULENCE_LAMBDAH: 160.0
{{ BACM_1M_ }}TURBULENCE_LAMBDAM: 160.0

###########################################################

###########################################################
Expand Down
11 changes: 6 additions & 5 deletions HISTORY.AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ PC{{ CLIM_IM }}x{{ CLIM_JM }}-DC.LM: {{ AGCM_LM }}
'Q2M' , 'SURFACE' ,
'U10N;V10N' , 'SURFACE' ,
'U10M;V10M' , 'SURFACE' ,
'UU10M' , 'SURFACE' ,
'T10M' , 'SURFACE' ,
'Q10M' , 'SURFACE' ,
'U50M;V50M' , 'SURFACE' ,
Expand Down Expand Up @@ -1075,12 +1076,12 @@ PC{{ CLIM_IM }}x{{ CLIM_JM }}-DC.LM: {{ AGCM_LM }}
'NIPNO3AQ' , 'NI' ,
'NIPNH4AQ' , 'NI' ,
'NIPNH3AQ' , 'NI' ,
'NIHT' , 'NI' ,
'NISD' , 'NI' ,
'NIDP' , 'NI' ,
'NIWT' , 'NI' ,
'NIHT' , 'NI' , 'NIHT001';'NIHT002';'NIHT003',
'NISD' , 'NI' , 'NISD001';'NISD002';'NISD003',
'NIDP' , 'NI' , 'NIDP001';'NIDP002';'NIDP003',
'NIWT' , 'NI' , 'NIWT001';'NIWT002';'NIWT003',
'NH3EM' , 'NI' ,
'NH3DP' , 'NI' ,
'NH3DP' , 'NI' ,
'NH3WT' , 'NI' ,
'NH4SD' , 'NI' ,
'NH4DP' , 'NI' ,
Expand Down
54 changes: 0 additions & 54 deletions gcm_forecast.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,60 +715,6 @@ endif
#ln -sf $SSTDIR/dataoceanfile_MERRA2_SST.${OGCM_IM}x${OGCM_JM}.${yy}.data sst.data
#ln -sf $SSTDIR/dataoceanfile_MERRA2_ICE.${OGCM_IM}x${OGCM_JM}.${yy}.data fraci.data

#######################################################################
# Split Saltwater Restart if detected
#######################################################################

if ( (-e $SCRDIR/openwater_internal_rst) && (-e $SCRDIR/seaicethermo_internal_rst)) then
echo "Saltwater internal state is already split, good to go!"
else
if ( ( -e $SCRDIR/saltwater_internal_rst ) || ( -e $EXPDIR/saltwater_internal_rst) ) then

echo "Found Saltwater internal state. Splitting..."

# If saltwater_internal_rst is in EXPDIR move to SCRDIR
# -----------------------------------------------------
if ( -e $EXPDIR/saltwater_internal_rst ) /bin/mv $EXPDIR/saltwater_internal_rst $SCRDIR

# The splitter script requires an OutData directory
# -------------------------------------------------
if (! -d OutData ) mkdir -p OutData

# Run the script
# --------------
{{ SINGULARITY_BUILD }} $RUN_CMD 1 $SINGULARITY_RUN $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst
{{ NATIVE_BUILD }} $RUN_CMD 1 $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst

# Move restarts
# -------------
/bin/mv OutData/openwater_internal_rst OutData/seaicethermo_internal_rst .

# Remove OutData
# --------------
/bin/rmdir OutData

# Make decorated copies for restarts tarball
# ------------------------------------------
cp openwater_internal_rst $EXPID.openwater_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
cp seaicethermo_internal_rst $EXPID.seaicethermo_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}

# Inject decorated copies into restarts tarball
# ---------------------------------------------
tar rf $EXPDIR/restarts/restarts.${edate}.tar $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}

# Remove the decorated restarts
# -----------------------------
/bin/rm $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}

# Remove the saltwater internal restart
# -------------------------------------
/bin/rm $SCRDIR/saltwater_internal_rst
else
echo "Neither saltwater_internal_rst, nor openwater_internal_rst and seaicethermo_internal_rst were found. Abort!"
exit 6
endif
endif

# Test Openwater Restart for Number of tiles correctness
# ------------------------------------------------------

Expand Down
28 changes: 0 additions & 28 deletions gcm_regress.j
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,34 +204,6 @@ endif

if(! -e tile.bin) $GEOSBIN/binarytile.x tile.data tile.bin

#######################################################################
# Split Saltwater Restart if detected
#######################################################################

if ( (-e $EXPDIR/regress/openwater_internal_rst) && (-e $EXPDIR/regress/seaicethermo_internal_rst)) then
echo "Saltwater internal state is already split, good to go!"
else
if ( -e $EXPDIR/regress/saltwater_internal_rst ) then

# The splitter script requires an OutData directory
# -------------------------------------------------
if (! -d OutData ) mkdir -p OutData

# Run the script
# --------------
$RUN_CMD 1 $GEOSBIN/SaltIntSplitter tile.data $EXPDIR/regress/saltwater_internal_rst

# Move restarts
# -------------
/bin/mv OutData/openwater_internal_rst OutData/seaicethermo_internal_rst .

# Remove OutData
# --------------
/bin/rmdir OutData

endif
endif

#######################################################################
# Create Simple History for Efficiency
#######################################################################
Expand Down
54 changes: 0 additions & 54 deletions gcm_run.j
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,60 +940,6 @@ endif
{{ CICE6 }} sed -i -E 's/^[[:space:]]*restart_pond_lvl[[:space:]]*=[[:space:]]*\.true\./ restart_pond_lvl = .false./' ice_in
{{ CICE6 }} endif

#######################################################################
# Split Saltwater Restart if detected
#######################################################################

if ( (-e $SCRDIR/openwater_internal_rst) && (-e $SCRDIR/seaicethermo_internal_rst)) then
echo "Saltwater internal state is already split, good to go!"
else
if ( ( ( -e $SCRDIR/saltwater_internal_rst ) || ( -e $EXPDIR/saltwater_internal_rst) ) && ( $counter == 1 ) ) then

echo "Found Saltwater internal state. Splitting..."

# If saltwater_internal_rst is in EXPDIR move to SCRDIR
# -----------------------------------------------------
if ( -e $EXPDIR/saltwater_internal_rst ) /bin/cp $EXPDIR/saltwater_internal_rst $SCRDIR

# The splitter script requires an OutData directory
# -------------------------------------------------
if (! -d OutData ) mkdir -p OutData

# Run the script
# --------------
{{ SINGULARITY_BUILD }} $RUN_CMD 1 $SINGULARITY_RUN $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst
{{ NATIVE_BUILD }} $RUN_CMD 1 $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst

# Move restarts
# -------------
/bin/mv OutData/openwater_internal_rst OutData/seaicethermo_internal_rst .

# Remove OutData
# --------------
/bin/rmdir OutData

# Make decorated copies for restarts tarball
# ------------------------------------------
cp openwater_internal_rst $EXPID.openwater_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
cp seaicethermo_internal_rst $EXPID.seaicethermo_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}

# Inject decorated copies into restarts tarball
# ---------------------------------------------
tar rf $EXPDIR/restarts/restarts.${edate}.tar $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}

# Remove the decorated restarts
# -----------------------------
/bin/rm $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}

# Remove the saltwater internal restart
# -------------------------------------
/bin/rm $SCRDIR/saltwater_internal_rst
else
echo "Neither saltwater_internal_rst, nor openwater_internal_rst and seaicethermo_internal_rst were found. Abort!"
exit 6
endif
endif

# Test Openwater Restart for Number of tiles correctness
# ------------------------------------------------------

Expand Down
56 changes: 0 additions & 56 deletions gcm_run.j-new_rst_approach
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,62 +853,6 @@ endif
@CICE6 sed -i -E 's/^[[:space:]]*restart_pond_lvl[[:space:]]*=[[:space:]]*\.true\./ restart_pond_lvl = .false./' ice_in
@CICE6 endif

#######################################################################
# Split Saltwater Restart if detected
#######################################################################

if ( (-e $SCRDIR/openwater_internal_rst) && (-e $SCRDIR/seaicethermo_internal_rst)) then
echo "Saltwater internal state is already split, good to go!"
else
if ( ( ( -e $SCRDIR/saltwater_internal_rst ) || ( -e $EXPDIR/saltwater_internal_rst) ) && ( $counter == 1 ) ) then

echo "Found Saltwater internal state. Splitting..."

# If saltwater_internal_rst is in EXPDIR move to SCRDIR
# -----------------------------------------------------
if ( -e $EXPDIR/saltwater_internal_rst ) /bin/cp $EXPDIR/saltwater_internal_rst $SCRDIR

# The splitter script requires an OutData directory
# -------------------------------------------------
if (! -d OutData ) mkdir -p OutData

# Run the script
# --------------
@SINGULARITY_BUILD $RUN_CMD 1 $SINGULARITY_RUN $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst
@NATIVE_BUILD $RUN_CMD 1 $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst

# Move restarts
# -------------
/bin/mv OutData/openwater_internal_rst OutData/seaicethermo_internal_rst .

# Remove OutData
# --------------
/bin/rmdir OutData

if (-e $EXPDIR/restarts/restarts.${edate}.tar ) then
# Make decorated copies for restarts tarball
# ------------------------------------------
cp openwater_internal_rst $EXPID.openwater_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
cp seaicethermo_internal_rst $EXPID.seaicethermo_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}

# Inject decorated copies into restarts tarball
# ---------------------------------------------
tar rf $EXPDIR/restarts/restarts.${edate}.tar $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}

# Remove the decorated restarts
# -----------------------------
/bin/rm $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
endif

# Remove the saltwater internal restart
# -------------------------------------
/bin/rm $SCRDIR/saltwater_internal_rst
else
echo "Neither saltwater_internal_rst, nor openwater_internal_rst and seaicethermo_internal_rst were found. Abort!"
exit 6
endif
endif

# Test Openwater Restart for Number of tiles correctness
# ------------------------------------------------------

Expand Down
53 changes: 0 additions & 53 deletions gcm_run_benchmark.j
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,59 +732,6 @@ endif
#ln -sf $SSTDIR/dataoceanfile_MERRA2_SST.${OGCM_IM}x${OGCM_JM}.${yy}.data sst.data
#ln -sf $SSTDIR/dataoceanfile_MERRA2_ICE.${OGCM_IM}x${OGCM_JM}.${yy}.data fraci.data

#######################################################################
# Split Saltwater Restart if detected
#######################################################################

if ( (-e $SCRDIR/openwater_internal_rst) && (-e $SCRDIR/seaicethermo_internal_rst)) then
echo "Saltwater internal state is already split, good to go!"
else
if ( ( ( -e $SCRDIR/saltwater_internal_rst ) || ( -e $EXPDIR/saltwater_internal_rst) ) && ( $counter == 1 ) ) then

echo "Found Saltwater internal state. Splitting..."

# If saltwater_internal_rst is in EXPDIR move to SCRDIR
# -----------------------------------------------------
if ( -e $EXPDIR/saltwater_internal_rst ) /bin/mv $EXPDIR/saltwater_internal_rst $SCRDIR

# The splitter script requires an OutData directory
# -------------------------------------------------
if (! -d OutData ) mkdir -p OutData

# Run the script
# --------------
$RUN_CMD 1 $GEOSBIN/SaltIntSplitter tile.data $SCRDIR/saltwater_internal_rst

# Move restarts
# -------------
/bin/mv OutData/openwater_internal_rst OutData/seaicethermo_internal_rst .

# Remove OutData
# --------------
/bin/rmdir OutData

# Make decorated copies for restarts tarball
# ------------------------------------------
cp openwater_internal_rst $EXPID.openwater_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}
cp seaicethermo_internal_rst $EXPID.seaicethermo_internal_rst.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}

# Inject decorated copies into restarts tarball
# ---------------------------------------------
tar rf $EXPDIR/restarts/restarts.${edate}.tar $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}

# Remove the decorated restarts
# -----------------------------
/bin/rm $EXPID.*.${edate}.${GCMVER}.${BCTAG}_${BCRSLV}

# Remove the saltwater internal restart
# -------------------------------------
/bin/rm $SCRDIR/saltwater_internal_rst
else
echo "Neither saltwater_internal_rst, nor openwater_internal_rst and seaicethermo_internal_rst were found. Abort!"
exit 6
endif
endif

# Test Openwater Restart for Number of tiles correctness
# ------------------------------------------------------

Expand Down
Loading
Loading