diff --git a/.github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md b/.github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
index 55020d73..6e3635e2 100644
--- a/.github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
+++ b/.github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
@@ -1,4 +1,4 @@
-## :memo:  Automatic PR: `develop` → `release/MAPL-v3`
+## :memo:  Automatic PR: `v12` → `release/MAPL-v3`
 
 ### Description
 
diff --git a/.github/workflows/push-to-develop.yml b/.github/workflows/push-to-v12.yml
similarity index 80%
rename from .github/workflows/push-to-develop.yml
rename to .github/workflows/push-to-v12.yml
index 551e1dde..b5f4196f 100644
--- a/.github/workflows/push-to-develop.yml
+++ b/.github/workflows/push-to-v12.yml
@@ -1,9 +1,9 @@
-name: Push to Develop
+name: Push to v12
 
 on:
   push:
     branches:
-      - develop
+      - feature/sdrabenh/gcm_v12
 
 jobs:
   pull_request:
@@ -19,7 +19,7 @@ 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
@@ -27,5 +27,5 @@ jobs:
           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 }}
 
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 7696a7d1..df000662 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -18,6 +18,7 @@ concurrency:
 jobs:
   build_gcm:
     strategy:
+      fail-fast: false
       matrix:
         compiler: [ifort, gfortran-14, gfortran-15]
         build-type: [Debug]
@@ -36,4 +37,5 @@ jobs:
     with:
       fixture-repo: GEOS-ESM/GEOSgcm
       fixture-ref: feature/sdrabenh/gcm_v12
+      load-fms: true
 
diff --git a/AGCM.rc.tmpl b/AGCM.rc.tmpl
index 9664aab2..fb003fab 100644
--- a/AGCM.rc.tmpl
+++ b/AGCM.rc.tmpl
@@ -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
@@ -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
-
 ###########################################################
 
 ###########################################################
diff --git a/HISTORY.AGCM.rc.tmpl b/HISTORY.AGCM.rc.tmpl
index 99d09b41..ca9b2cf9 100644
--- a/HISTORY.AGCM.rc.tmpl
+++ b/HISTORY.AGCM.rc.tmpl
@@ -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'     ,
@@ -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'        ,
diff --git a/gcm_forecast.tmpl b/gcm_forecast.tmpl
index 41d773fb..044eca8d 100755
--- a/gcm_forecast.tmpl
+++ b/gcm_forecast.tmpl
@@ -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
 # ------------------------------------------------------
 
diff --git a/gcm_regress.j b/gcm_regress.j
index ce42f842..d3e83a89 100755
--- a/gcm_regress.j
+++ b/gcm_regress.j
@@ -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
 #######################################################################
diff --git a/gcm_run.j b/gcm_run.j
index e1857834..75f39bf5 100755
--- a/gcm_run.j
+++ b/gcm_run.j
@@ -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
 # ------------------------------------------------------
 
diff --git a/gcm_run.j-new_rst_approach b/gcm_run.j-new_rst_approach
index 39236f2b..c622d819 100755
--- a/gcm_run.j-new_rst_approach
+++ b/gcm_run.j-new_rst_approach
@@ -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
 # ------------------------------------------------------
 
diff --git a/gcm_run_benchmark.j b/gcm_run_benchmark.j
index e96f82af..9e01884d 100755
--- a/gcm_run_benchmark.j
+++ b/gcm_run_benchmark.j
@@ -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
 # ------------------------------------------------------
 
diff --git a/gcm_setup b/gcm_setup
index d60f4e69..aa7780f9 100644
--- a/gcm_setup
+++ b/gcm_setup
@@ -1487,8 +1487,14 @@ else if( $SITE == 'NCCS' ) then
               setenv    PLOT_Q  "SBATCH --constraint=${MODEL}"                                # batch queue name for gcm_plot.j
               setenv    MOVE_Q  "SBATCH --partition=datamove"                                 # batch queue name for gcm_moveplot.j
               setenv ARCHIVE_Q  "SBATCH --partition=datamove"                                 # batch queue name for gcm_archive.j
-              setenv    POST_P  "SBATCH --nodes=${NPCUS} --ntasks-per-node=${NCPUS_PER_NODE}" # PE Configuration for gcm_post.j
-              setenv    PLOT_P  "SBATCH --nodes=4 --ntasks=4"                                 # PE Configuration for gcm_plot.j
+              setenv    POST_P  "SBATCH --nodes=1 --ntasks-per-node=${NCPUS_PER_NODE}"        # PE Configuration for gcm_post.j
+              if      ($MODEL == 'mil') then
+                 setenv PLOT_P  "SBATCH --constraint=${MODEL} --nodes=1 --ntasks-per-node=24 --mem=488G"  # PE Configuration for gcm_plot.j
+              else if ($MODEL == 'cas') then
+                 setenv PLOT_P  "SBATCH --constraint=${MODEL} --nodes=1 --ntasks-per-node=10 --mem=185G"  # PE Configuration for gcm_plot.j
+              else
+                 setenv PLOT_P  "SBATCH --nodes=4 --ntasks=4"                                 # PE Configuration for gcm_plot.j
+              endif
               setenv ARCHIVE_P  "SBATCH --ntasks=1"                                           # PE Configuration for gcm_archive.j
               setenv    MOVE_P  "SBATCH --ntasks=1"                                           # PE Configuration for gcm_moveplot.j
 
@@ -2489,6 +2495,19 @@ endif
 # Enable DATA_DRIVEN GOCART2G
 # ---------------------------
 if( $AERO_PROVIDER == GOCART2G ) then
+
+    # Switch GOCART2G tuning coefficients to L072 values if needed
+    # -------------------------------------------------------------
+    if( $AGCM_LM == 72 ) then
+        foreach file ($EXPDIR/RC/DU2G_instance_DU.rc $EXPDIR/RC/SS2G_instance_SS.rc)
+            /bin/mv $file $EXPDIR/RC/dummy
+            sed -e 's/^\(.*# L181\)/#\1/' \
+                -e 's/^#\(.*# L072\)/\1/' \
+                $EXPDIR/RC/dummy > $file
+        end
+        /bin/rm -f $EXPDIR/RC/dummy
+    endif
+
     if ($DATA_DRIVEN == TRUE ) then
        /bin/mv $EXPDIR/RC/GOCART2G_GridComp.rc $EXPDIR/RC/GOCART2G_GridComp.tmp
        cat $EXPDIR/RC/GOCART2G_GridComp.tmp | \
diff --git a/geoschemchem_setup b/geoschemchem_setup
index 01ca176a..3e50e1b7 100755
--- a/geoschemchem_setup
+++ b/geoschemchem_setup
@@ -1502,8 +1502,14 @@ else if( $SITE == 'NCCS' ) then
               setenv    PLOT_Q  "SBATCH --constraint=${MODEL}"                                # batch queue name for gcm_plot.j
               setenv    MOVE_Q  "SBATCH --partition=datamove"                                 # batch queue name for gcm_moveplot.j
               setenv ARCHIVE_Q  "SBATCH --partition=datamove"                                 # batch queue name for gcm_archive.j
-              setenv    POST_P  "SBATCH --nodes=${NPCUS} --ntasks-per-node=${NCPUS_PER_NODE}" # PE Configuration for gcm_post.j
-              setenv    PLOT_P  "SBATCH --nodes=4 --ntasks=4"                                 # PE Configuration for gcm_plot.j
+              setenv    POST_P  "SBATCH --nodes=1 --ntasks-per-node=${NCPUS_PER_NODE}"        # PE Configuration for gcm_post.j
+              if      ($MODEL == 'mil') then
+                 setenv PLOT_P  "SBATCH --constraint=${MODEL} --nodes=1 --ntasks-per-node=24 --mem=488G"  # PE Configuration for gcm_plot.j
+              else if ($MODEL == 'cas') then
+                 setenv PLOT_P  "SBATCH --constraint=${MODEL} --nodes=1 --ntasks-per-node=10 --mem=185G"  # PE Configuration for gcm_plot.j
+              else
+                 setenv PLOT_P  "SBATCH --nodes=4 --ntasks=4"                                 # PE Configuration for gcm_plot.j
+              endif
               setenv ARCHIVE_P  "SBATCH --ntasks=1"                                           # PE Configuration for gcm_archive.j
               setenv    MOVE_P  "SBATCH --ntasks=1"                                           # PE Configuration for gcm_moveplot.j
 
@@ -2669,6 +2675,19 @@ endif
 # Enable DATA_DRIVEN GOCART2G
 # ---------------------------
 if( $AERO_PROVIDER == GOCART2G ) then
+
+    # Switch GOCART2G tuning coefficients to L072 values if needed
+    # -------------------------------------------------------------
+    if( $AGCM_LM == 72 ) then
+        foreach file ($EXPDIR/RC/DU2G_instance_DU.rc $EXPDIR/RC/SS2G_instance_SS.rc)
+            /bin/mv $file $EXPDIR/RC/dummy
+            sed -e 's/^\(.*# L181\)/#\1/' \
+                -e 's/^#\(.*# L072\)/\1/' \
+                $EXPDIR/RC/dummy > $file
+        end
+        /bin/rm -f $EXPDIR/RC/dummy
+    endif
+
     if ($DATA_DRIVEN == TRUE ) then
        /bin/mv $EXPDIR/RC/GOCART2G_GridComp.rc $EXPDIR/RC/GOCART2G_GridComp.tmp
        cat $EXPDIR/RC/GOCART2G_GridComp.tmp | \
diff --git a/gmichem_setup b/gmichem_setup
index 030a15c4..54c2055d 100755
--- a/gmichem_setup
+++ b/gmichem_setup
@@ -1676,8 +1676,14 @@ else if( $SITE == 'NCCS' ) then
               setenv    PLOT_Q  "SBATCH --constraint=${MODEL}"                                # batch queue name for gcm_plot.j
               setenv    MOVE_Q  "SBATCH --partition=datamove"                                 # batch queue name for gcm_moveplot.j
               setenv ARCHIVE_Q  "SBATCH --partition=datamove"                                 # batch queue name for gcm_archive.j
-              setenv    POST_P  "SBATCH --nodes=${NPCUS} --ntasks-per-node=${NCPUS_PER_NODE}" # PE Configuration for gcm_post.j
-              setenv    PLOT_P  "SBATCH --nodes=4 --ntasks=4"                                 # PE Configuration for gcm_plot.j
+              setenv    POST_P  "SBATCH --nodes=1 --ntasks-per-node=${NCPUS_PER_NODE}"        # PE Configuration for gcm_post.j
+              if      ($MODEL == 'mil') then
+                 setenv PLOT_P  "SBATCH --constraint=${MODEL} --nodes=1 --ntasks-per-node=24 --mem=488G"  # PE Configuration for gcm_plot.j
+              else if ($MODEL == 'cas') then
+                 setenv PLOT_P  "SBATCH --constraint=${MODEL} --nodes=1 --ntasks-per-node=10 --mem=185G"  # PE Configuration for gcm_plot.j
+              else
+                 setenv PLOT_P  "SBATCH --nodes=4 --ntasks=4"                                 # PE Configuration for gcm_plot.j
+              endif
               setenv ARCHIVE_P  "SBATCH --ntasks=1"                                           # PE Configuration for gcm_archive.j
               setenv    MOVE_P  "SBATCH --ntasks=1"                                           # PE Configuration for gcm_moveplot.j
 
@@ -2842,6 +2848,19 @@ awk '{ if ($1~"ENABLE_GOCART_DATA:") { sub(/TRUE/,"FALSE") }; print }' > $EXPDIR
 # Turn on GOCART2G
 # ----------------
 if( $LGOCART2G == TRUE ) then
+
+    # Switch GOCART2G tuning coefficients to L072 values if needed
+    # -------------------------------------------------------------
+    if( $AGCM_LM == 72 ) then
+        foreach file ($EXPDIR/RC/DU2G_instance_DU.rc $EXPDIR/RC/SS2G_instance_SS.rc)
+            /bin/mv $file $EXPDIR/RC/dummy
+            sed -e 's/^\(.*# L181\)/#\1/' \
+                -e 's/^#\(.*# L072\)/\1/' \
+                $EXPDIR/RC/dummy > $file
+        end
+        /bin/rm -f $EXPDIR/RC/dummy
+    endif
+
     if ($DATA_DRIVEN == TRUE ) then
        /bin/mv $EXPDIR/RC/GOCART2G_GridComp.rc $EXPDIR/RC/GOCART2G_GridComp.tmp
        cat $EXPDIR/RC/GOCART2G_GridComp.tmp | \
diff --git a/stratchem_setup b/stratchem_setup
index f0a34d94..084dd951 100755
--- a/stratchem_setup
+++ b/stratchem_setup
@@ -1487,8 +1487,14 @@ else if( $SITE == 'NCCS' ) then
               setenv    PLOT_Q  "SBATCH --constraint=${MODEL}"                                # batch queue name for gcm_plot.j
               setenv    MOVE_Q  "SBATCH --partition=datamove"                                 # batch queue name for gcm_moveplot.j
               setenv ARCHIVE_Q  "SBATCH --partition=datamove"                                 # batch queue name for gcm_archive.j
-              setenv    POST_P  "SBATCH --nodes=${NPCUS} --ntasks-per-node=${NCPUS_PER_NODE}" # PE Configuration for gcm_post.j
-              setenv    PLOT_P  "SBATCH --nodes=4 --ntasks=4"                                 # PE Configuration for gcm_plot.j
+              setenv    POST_P  "SBATCH --nodes=1 --ntasks-per-node=${NCPUS_PER_NODE}"        # PE Configuration for gcm_post.j
+              if      ($MODEL == 'mil') then
+                 setenv PLOT_P  "SBATCH --constraint=${MODEL} --nodes=1 --ntasks-per-node=24 --mem=488G"  # PE Configuration for gcm_plot.j
+              else if ($MODEL == 'cas') then
+                 setenv PLOT_P  "SBATCH --constraint=${MODEL} --nodes=1 --ntasks-per-node=10 --mem=185G"  # PE Configuration for gcm_plot.j
+              else
+                 setenv PLOT_P  "SBATCH --nodes=4 --ntasks=4"                                 # PE Configuration for gcm_plot.j
+              endif
               setenv ARCHIVE_P  "SBATCH --ntasks=1"                                           # PE Configuration for gcm_archive.j
               setenv    MOVE_P  "SBATCH --ntasks=1"                                           # PE Configuration for gcm_moveplot.j
 
@@ -2535,6 +2541,19 @@ endif
 # Enable DATA_DRIVEN GOCART2G
 # ---------------------------
 if( $AERO_PROVIDER == GOCART2G ) then
+
+    # Switch GOCART2G tuning coefficients to L072 values if needed
+    # -------------------------------------------------------------
+    if( $AGCM_LM == 72 ) then
+        foreach file ($EXPDIR/RC/DU2G_instance_DU.rc $EXPDIR/RC/SS2G_instance_SS.rc)
+            /bin/mv $file $EXPDIR/RC/dummy
+            sed -e 's/^\(.*# L181\)/#\1/' \
+                -e 's/^#\(.*# L072\)/\1/' \
+                $EXPDIR/RC/dummy > $file
+        end
+        /bin/rm -f $EXPDIR/RC/dummy
+    endif
+
     if ($DATA_DRIVEN == TRUE ) then
        /bin/mv $EXPDIR/RC/GOCART2G_GridComp.rc $EXPDIR/RC/GOCART2G_GridComp.tmp
        cat $EXPDIR/RC/GOCART2G_GridComp.tmp | \