Move to use MODELATM and DATAATM

GEOS-ESM · Jan 6, 2025 · 43f5cdc · 43f5cdc
1 parent d5198b4
commit 43f5cdc
Show file tree

Hide file tree

Showing 5 changed files with 127 additions and 127 deletions.
diff --git a/AGCM.rc.tmpl b/AGCM.rc.tmpl
@@ -585,123 +585,123 @@ MAPL_ENABLE_BOOTSTRAP: @BOOT
 
 # Required AGCM Model Restart Files
 # ---------------------------------
-@ACTUAL_ATM4OCNDYN_INTERNAL_RESTART_FILE:              fvcore_internal_rst
-@ACTUAL_ATM4OCNDYN_INTERNAL_CHECKPOINT_FILE:           fvcore_internal_checkpoint
-@ACTUAL_ATM4OCNDYN_INTERNAL_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
-@ACTUAL_ATM4OCNDYN_INTERNAL_HEADER:                    1
+@MODELATMDYN_INTERNAL_RESTART_FILE:              fvcore_internal_rst
+@MODELATMDYN_INTERNAL_CHECKPOINT_FILE:           fvcore_internal_checkpoint
+@MODELATMDYN_INTERNAL_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
+@MODELATMDYN_INTERNAL_HEADER:                    1
 
-@ACTUAL_ATM4OCNGWD_INTERNAL_RESTART_FILE:              gwd_internal_rst
-@ACTUAL_ATM4OCNGWD_INTERNAL_CHECKPOINT_FILE:           gwd_internal_checkpoint
-@ACTUAL_ATM4OCNGWD_INTERNAL_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
+@MODELATMGWD_INTERNAL_RESTART_FILE:              gwd_internal_rst
+@MODELATMGWD_INTERNAL_CHECKPOINT_FILE:           gwd_internal_checkpoint
+@MODELATMGWD_INTERNAL_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNLAKE_INTERNAL_RESTART_FILE:             lake_internal_rst
-@ACTUAL_ATM4OCNLAKE_INTERNAL_CHECKPOINT_FILE:          lake_internal_checkpoint
-@ACTUAL_ATM4OCNLAKE_INTERNAL_CHECKPOINT_TYPE:          @CHECKPOINT_TYPE
+@MODELATMLAKE_INTERNAL_RESTART_FILE:             lake_internal_rst
+@MODELATMLAKE_INTERNAL_CHECKPOINT_FILE:          lake_internal_checkpoint
+@MODELATMLAKE_INTERNAL_CHECKPOINT_TYPE:          @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNLANDICE_INTERNAL_RESTART_FILE:          landice_internal_rst
-@ACTUAL_ATM4OCNLANDICE_INTERNAL_CHECKPOINT_FILE:       landice_internal_checkpoint
-@ACTUAL_ATM4OCNLANDICE_INTERNAL_CHECKPOINT_TYPE:       @CHECKPOINT_TYPE
+@MODELATMLANDICE_INTERNAL_RESTART_FILE:          landice_internal_rst
+@MODELATMLANDICE_INTERNAL_CHECKPOINT_FILE:       landice_internal_checkpoint
+@MODELATMLANDICE_INTERNAL_CHECKPOINT_TYPE:       @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNCATCH_INTERNAL_RESTART_FILE:            catch_internal_rst
-@ACTUAL_ATM4OCNCATCH_INTERNAL_CHECKPOINT_FILE:         catch_internal_checkpoint
-@ACTUAL_ATM4OCNCATCH_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
+@MODELATMCATCH_INTERNAL_RESTART_FILE:            catch_internal_rst
+@MODELATMCATCH_INTERNAL_CHECKPOINT_FILE:         catch_internal_checkpoint
+@MODELATMCATCH_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNCATCHCNCLM40_INTERNAL_RESTART_FILE:     catchcn_internal_rst
-@ACTUAL_ATM4OCNCATCHCNCLM40_INTERNAL_CHECKPOINT_FILE:  catchcn_internal_checkpoint
-@ACTUAL_ATM4OCNCATCHCNCLM40_INTERNAL_CHECKPOINT_TYPE:  @CHECKPOINT_TYPE
+@MODELATMCATCHCNCLM40_INTERNAL_RESTART_FILE:     catchcn_internal_rst
+@MODELATMCATCHCNCLM40_INTERNAL_CHECKPOINT_FILE:  catchcn_internal_checkpoint
+@MODELATMCATCHCNCLM40_INTERNAL_CHECKPOINT_TYPE:  @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNMOIST_INTERNAL_RESTART_FILE:            moist_internal_rst
-@ACTUAL_ATM4OCNMOIST_INTERNAL_CHECKPOINT_FILE:         moist_internal_checkpoint
-@ACTUAL_ATM4OCNMOIST_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
+@MODELATMMOIST_INTERNAL_RESTART_FILE:            moist_internal_rst
+@MODELATMMOIST_INTERNAL_CHECKPOINT_FILE:         moist_internal_checkpoint
+@MODELATMMOIST_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
 
 # Boot-Strapable AGCM Model Restart Files
 # ---------------------------------------
-@ACTUAL_ATM4OCNAIAU_IMPORT_RESTART_FILE:               aiau_import_rst
-@ACTUAL_ATM4OCNAIAU_IMPORT_CHECKPOINT_FILE:            aiau_import_checkpoint
-@ACTUAL_ATM4OCNAIAU_IMPORT_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
+@MODELATMAIAU_IMPORT_RESTART_FILE:               aiau_import_rst
+@MODELATMAIAU_IMPORT_CHECKPOINT_FILE:            aiau_import_checkpoint
+@MODELATMAIAU_IMPORT_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNGWD_IMPORT_RESTART_FILE:                gwd_import_rst
-@ACTUAL_ATM4OCNGWD_IMPORT_CHECKPOINT_FILE:             gwd_import_checkpoint
-@ACTUAL_ATM4OCNGWD_IMPORT_CHECKPOINT_TYPE:             @CHECKPOINT_TYPE
+@MODELATMGWD_IMPORT_RESTART_FILE:                gwd_import_rst
+@MODELATMGWD_IMPORT_CHECKPOINT_FILE:             gwd_import_checkpoint
+@MODELATMGWD_IMPORT_CHECKPOINT_TYPE:             @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNMOIST_IMPORT_RESTART_FILE:              moist_import_rst
-@ACTUAL_ATM4OCNMOIST_IMPORT_CHECKPOINT_FILE:           moist_import_checkpoint
-@ACTUAL_ATM4OCNMOIST_IMPORT_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
+@MODELATMMOIST_IMPORT_RESTART_FILE:              moist_import_rst
+@MODELATMMOIST_IMPORT_CHECKPOINT_FILE:           moist_import_checkpoint
+@MODELATMMOIST_IMPORT_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
 
 SURFACE_IMPORT_RESTART_FILE:            surf_import_rst
 SURFACE_IMPORT_CHECKPOINT_FILE:         surf_import_checkpoint
 SURFACE_IMPORT_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNSOLAR_INTERNAL_RESTART_FILE:            solar_internal_rst
-@ACTUAL_ATM4OCNSOLAR_INTERNAL_CHECKPOINT_FILE:         solar_internal_checkpoint
-@ACTUAL_ATM4OCNSOLAR_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
+@MODELATMSOLAR_INTERNAL_RESTART_FILE:            solar_internal_rst
+@MODELATMSOLAR_INTERNAL_CHECKPOINT_FILE:         solar_internal_checkpoint
+@MODELATMSOLAR_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNIRRAD_INTERNAL_RESTART_FILE:            irrad_internal_rst
-@ACTUAL_ATM4OCNIRRAD_INTERNAL_CHECKPOINT_FILE:         irrad_internal_checkpoint
-@ACTUAL_ATM4OCNIRRAD_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
+@MODELATMIRRAD_INTERNAL_RESTART_FILE:            irrad_internal_rst
+@MODELATMIRRAD_INTERNAL_CHECKPOINT_FILE:         irrad_internal_checkpoint
+@MODELATMIRRAD_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNTURBULENCE_INTERNAL_RESTART_FILE:       turb_internal_rst
-@ACTUAL_ATM4OCNTURBULENCE_INTERNAL_CHECKPOINT_FILE:    turb_internal_checkpoint
-@ACTUAL_ATM4OCNTURBULENCE_INTERNAL_CHECKPOINT_TYPE:    @CHECKPOINT_TYPE
+@MODELATMTURBULENCE_INTERNAL_RESTART_FILE:       turb_internal_rst
+@MODELATMTURBULENCE_INTERNAL_CHECKPOINT_FILE:    turb_internal_checkpoint
+@MODELATMTURBULENCE_INTERNAL_CHECKPOINT_TYPE:    @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNTURBULENCE_IMPORT_RESTART_FILE:         turb_import_rst
-@ACTUAL_ATM4OCNTURBULENCE_IMPORT_CHECKPOINT_FILE:      turb_import_checkpoint
-@ACTUAL_ATM4OCNTURBULENCE_IMPORT_CHECKPOINT_TYPE:      @CHECKPOINT_TYPE
+@MODELATMTURBULENCE_IMPORT_RESTART_FILE:         turb_import_rst
+@MODELATMTURBULENCE_IMPORT_CHECKPOINT_FILE:      turb_import_checkpoint
+@MODELATMTURBULENCE_IMPORT_CHECKPOINT_TYPE:      @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNPCHEM_INTERNAL_RESTART_FILE:            pchem_internal_rst
-@ACTUAL_ATM4OCNPCHEM_INTERNAL_CHECKPOINT_FILE:         pchem_internal_checkpoint
-@ACTUAL_ATM4OCNPCHEM_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
+@MODELATMPCHEM_INTERNAL_RESTART_FILE:            pchem_internal_rst
+@MODELATMPCHEM_INTERNAL_CHECKPOINT_FILE:         pchem_internal_checkpoint
+@MODELATMPCHEM_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNH2O_INTERNAL_RESTART_FILE:              h2o_internal_rst
-@ACTUAL_ATM4OCNH2O_INTERNAL_CHECKPOINT_FILE:           h2o_internal_checkpoint
-@ACTUAL_ATM4OCNH2O_INTERNAL_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
+@MODELATMH2O_INTERNAL_RESTART_FILE:              h2o_internal_rst
+@MODELATMH2O_INTERNAL_CHECKPOINT_FILE:           h2o_internal_checkpoint
+@MODELATMH2O_INTERNAL_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
 
 # Chemistry/AEROSOL Model Restart Files
 # -------------------------------------
-@ACTUAL_ATM4OCNGOCART_IMPORT_RESTART_FILE:             gocart_import_rst
-@ACTUAL_ATM4OCNGOCART_IMPORT_CHECKPOINT_FILE:          gocart_import_checkpoint
-@ACTUAL_ATM4OCNGOCART_IMPORT_CHECKPOINT_TYPE:          @CHECKPOINT_TYPE
+@MODELATMGOCART_IMPORT_RESTART_FILE:             gocart_import_rst
+@MODELATMGOCART_IMPORT_CHECKPOINT_FILE:          gocart_import_checkpoint
+@MODELATMGOCART_IMPORT_CHECKPOINT_TYPE:          @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNGOCART_INTERNAL_RESTART_FILE:           gocart_internal_rst
-@ACTUAL_ATM4OCNGOCART_INTERNAL_CHECKPOINT_FILE:        gocart_internal_checkpoint
-@ACTUAL_ATM4OCNGOCART_INTERNAL_CHECKPOINT_TYPE:        @CHECKPOINT_TYPE
+@MODELATMGOCART_INTERNAL_RESTART_FILE:           gocart_internal_rst
+@MODELATMGOCART_INTERNAL_CHECKPOINT_FILE:        gocart_internal_checkpoint
+@MODELATMGOCART_INTERNAL_CHECKPOINT_TYPE:        @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNGOCART.data_INTERNAL_RESTART_FILE:      gocartdata_internal_rst
-@ACTUAL_ATM4OCNGOCART.data_INTERNAL_CHECKPOINT_FILE:   gocartdata_internal_checkpoint
-@ACTUAL_ATM4OCNGOCART.data_INTERNAL_CHECKPOINT_TYPE:   @CHECKPOINT_TYPE
+@MODELATMGOCART.data_INTERNAL_RESTART_FILE:      gocartdata_internal_rst
+@MODELATMGOCART.data_INTERNAL_CHECKPOINT_FILE:   gocartdata_internal_checkpoint
+@MODELATMGOCART.data_INTERNAL_CHECKPOINT_TYPE:   @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNDU_INTERNAL_RESTART_FILE:               du_internal_rst
-@ACTUAL_ATM4OCNDU_INTERNAL_CHECKPOINT_FILE:            du_internal_checkpoint
-@ACTUAL_ATM4OCNDU_INTERNAL_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
+@MODELATMDU_INTERNAL_RESTART_FILE:               du_internal_rst
+@MODELATMDU_INTERNAL_CHECKPOINT_FILE:            du_internal_checkpoint
+@MODELATMDU_INTERNAL_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNSS_INTERNAL_RESTART_FILE:               ss_internal_rst
-@ACTUAL_ATM4OCNSS_INTERNAL_CHECKPOINT_FILE:            ss_internal_checkpoint
-@ACTUAL_ATM4OCNSS_INTERNAL_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
+@MODELATMSS_INTERNAL_RESTART_FILE:               ss_internal_rst
+@MODELATMSS_INTERNAL_CHECKPOINT_FILE:            ss_internal_checkpoint
+@MODELATMSS_INTERNAL_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNCA.oc_INTERNAL_RESTART_FILE:            caoc_internal_rst
-@ACTUAL_ATM4OCNCA.oc_INTERNAL_CHECKPOINT_FILE:         caoc_internal_checkpoint
-@ACTUAL_ATM4OCNCA.oc_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
+@MODELATMCA.oc_INTERNAL_RESTART_FILE:            caoc_internal_rst
+@MODELATMCA.oc_INTERNAL_CHECKPOINT_FILE:         caoc_internal_checkpoint
+@MODELATMCA.oc_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNCA.bc_INTERNAL_RESTART_FILE:            cabc_internal_rst
-@ACTUAL_ATM4OCNCA.bc_INTERNAL_CHECKPOINT_FILE:         cabc_internal_checkpoint
-@ACTUAL_ATM4OCNCA.bc_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
+@MODELATMCA.bc_INTERNAL_RESTART_FILE:            cabc_internal_rst
+@MODELATMCA.bc_INTERNAL_CHECKPOINT_FILE:         cabc_internal_checkpoint
+@MODELATMCA.bc_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNCA.br_INTERNAL_RESTART_FILE:            cabr_internal_rst
-@ACTUAL_ATM4OCNCA.br_INTERNAL_CHECKPOINT_FILE:         cabr_internal_checkpoint
-@ACTUAL_ATM4OCNCA.br_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
+@MODELATMCA.br_INTERNAL_RESTART_FILE:            cabr_internal_rst
+@MODELATMCA.br_INTERNAL_CHECKPOINT_FILE:         cabr_internal_checkpoint
+@MODELATMCA.br_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNNI_INTERNAL_RESTART_FILE:               ni_internal_rst
-@ACTUAL_ATM4OCNNI_INTERNAL_CHECKPOINT_FILE:            ni_internal_checkpoint
-@ACTUAL_ATM4OCNNI_INTERNAL_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
+@MODELATMNI_INTERNAL_RESTART_FILE:               ni_internal_rst
+@MODELATMNI_INTERNAL_CHECKPOINT_FILE:            ni_internal_checkpoint
+@MODELATMNI_INTERNAL_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNSU_INTERNAL_RESTART_FILE:               su_internal_rst
-@ACTUAL_ATM4OCNSU_INTERNAL_CHECKPOINT_FILE:            su_internal_checkpoint
-@ACTUAL_ATM4OCNSU_INTERNAL_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
+@MODELATMSU_INTERNAL_RESTART_FILE:               su_internal_rst
+@MODELATMSU_INTERNAL_CHECKPOINT_FILE:            su_internal_checkpoint
+@MODELATMSU_INTERNAL_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNCARMA_INTERNAL_RESTART_FILE:            carma_internal_rst
-@ACTUAL_ATM4OCNCARMA_INTERNAL_CHECKPOINT_FILE:         carma_internal_checkpoint
-@ACTUAL_ATM4OCNCARMA_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
+@MODELATMCARMA_INTERNAL_RESTART_FILE:            carma_internal_rst
+@MODELATMCARMA_INTERNAL_CHECKPOINT_FILE:         carma_internal_checkpoint
+@MODELATMCARMA_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
 #STRATCHEM_INTERNAL_RESTART_FILE:        stratchem_internal_rst
 #STRATCHEM_INTERNAL_CHECKPOINT_FILE:     stratchem_internal_checkpoint
@@ -727,29 +727,29 @@ SURFACE_IMPORT_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 #GEOSCHEMCHEM_IMPORT_CHECKPOINT_FILE:         geoschemchem_import_checkpoint
 #GEOSCHEMCHEM_IMPORT_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNMAM_INTERNAL_RESTART_FILE:              mam_internal_rst
-@ACTUAL_ATM4OCNMAM_INTERNAL_CHECKPOINT_FILE:           mam_internal_checkpoint
-@ACTUAL_ATM4OCNMAM_INTERNAL_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
+@MODELATMMAM_INTERNAL_RESTART_FILE:              mam_internal_rst
+@MODELATMMAM_INTERNAL_CHECKPOINT_FILE:           mam_internal_checkpoint
+@MODELATMMAM_INTERNAL_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNACHEM_INTERNAL_RESTART_FILE:            achem_internal_rst
-@ACTUAL_ATM4OCNACHEM_INTERNAL_CHECKPOINT_FILE:         achem_internal_checkpoint
-@ACTUAL_ATM4OCNACHEM_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
+@MODELATMACHEM_INTERNAL_RESTART_FILE:            achem_internal_rst
+@MODELATMACHEM_INTERNAL_CHECKPOINT_FILE:         achem_internal_checkpoint
+@MODELATMACHEM_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNTR_INTERNAL_RESTART_FILE:               tr_internal_rst
-@ACTUAL_ATM4OCNTR_INTERNAL_CHECKPOINT_FILE:            tr_internal_checkpoint
-@ACTUAL_ATM4OCNTR_INTERNAL_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
+@MODELATMTR_INTERNAL_RESTART_FILE:               tr_internal_rst
+@MODELATMTR_INTERNAL_CHECKPOINT_FILE:            tr_internal_checkpoint
+@MODELATMTR_INTERNAL_CHECKPOINT_TYPE:            @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNTR_IMPORT_RESTART_FILE:                 tr_import_rst
-@ACTUAL_ATM4OCNTR_IMPORT_CHECKPOINT_FILE:              tr_import_checkpoint
-@ACTUAL_ATM4OCNTR_IMPORT_CHECKPOINT_TYPE:              @CHECKPOINT_TYPE
+@MODELATMTR_IMPORT_RESTART_FILE:                 tr_import_rst
+@MODELATMTR_IMPORT_CHECKPOINT_FILE:              tr_import_checkpoint
+@MODELATMTR_IMPORT_CHECKPOINT_TYPE:              @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNHEMCO_INTERNAL_RESTART_FILE:            hemco_internal_rst
-@ACTUAL_ATM4OCNHEMCO_INTERNAL_CHECKPOINT_FILE:         hemco_internal_checkpoint
-@ACTUAL_ATM4OCNHEMCO_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
+@MODELATMHEMCO_INTERNAL_RESTART_FILE:            hemco_internal_rst
+@MODELATMHEMCO_INTERNAL_CHECKPOINT_FILE:         hemco_internal_checkpoint
+@MODELATMHEMCO_INTERNAL_CHECKPOINT_TYPE:         @CHECKPOINT_TYPE
 
-@ACTUAL_ATM4OCNHEMCO_IMPORT_RESTART_FILE:              hemco_import_rst
-@ACTUAL_ATM4OCNHEMCO_IMPORT_CHECKPOINT_FILE:           hemco_import_checkpoint
-@ACTUAL_ATM4OCNHEMCO_IMPORT_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
+@MODELATMHEMCO_IMPORT_RESTART_FILE:              hemco_import_rst
+@MODELATMHEMCO_IMPORT_CHECKPOINT_FILE:           hemco_import_checkpoint
+@MODELATMHEMCO_IMPORT_CHECKPOINT_TYPE:           @CHECKPOINT_TYPE
 
 #OH_INTERNAL_RESTART_FILE:               oh_internal_rst
 #OH_INTERNAL_CHECKPOINT_FILE:            oh_internal_checkpoint
@@ -837,9 +837,9 @@ TILING_FILE:                tile.bin
 VISDF_FILE:                visdf.dat
 NIRDF_FILE:                nirdf.dat
 LNFM_FILE:                 lnfm.data
-@ACTUAL_ATM4OCN@COUPLED ROUTING_FILE:             runoff.bin
+@MODELATM@COUPLED ROUTING_FILE:             runoff.bin
 
-@ACTUAL_ATM4OCNVEGDYN_INTERNAL_RESTART_FILE:  vegdyn.data
+@MODELATMVEGDYN_INTERNAL_RESTART_FILE:  vegdyn.data
 
 KPAR_FILE: SEAWIFS_KPAR_mon_clim.data
 
@@ -947,7 +947,7 @@ USE_WAVES: 0
 @COUPLED # ----------------
 @COUPLED USE_DATASEA:0
 @COUPLED OCEAN_NAME: @OCEAN_NAME
-@COUPLED USE_DATA_ATM4OCN: @USE_DATA_ATM4OCN
+@COUPLED DATAATM: @DATAATM
 @COUPLED USE_DATASEAICE:0
 @COUPLED steady_state_ocean: 0
 @COUPLED OCEAN_PICE_SCALING: 0.0

diff --git a/gcm_setup b/gcm_setup
@@ -958,8 +958,8 @@ endif
 # Check for Data Atmosphere
 #--------------------------
 set DATA_ATMOS = FALSE
-set ACTUAL_ATM4OCN = ""
-set USE_DATA_ATM4OCN = .FALSE.
+set MODELATM = ""
+set DATAATM = .FALSE.
 
 if( $OGCM == "TRUE" ) then
 
@@ -986,8 +986,8 @@ DATATMOS:
    endif
 
    if ($DATA_ATMOS == TRUE) then
-      set ACTUAL_ATM4OCN = "#DELETE"
-      set USE_DATA_ATM4OCN = .TRUE.
+      set MODELATM = "#DELETE"
+      set DATAATM = .TRUE.
 
       set DEFAULT_HISTORY_TEMPLATE = "HISTORY.DATAATM.rc.tmpl"
    endif
@@ -2519,8 +2519,8 @@ s?@PRELOAD_COMMAND?$PRELOAD_COMMAND?g
 s?@LD_LIBRARY_PATH_CMD?$LD_LIBRARY_PATH_CMD?g
 s?@RUN_CMD?$RUN_CMD?g
 
-s?@ACTUAL_ATM4OCN?$ACTUAL_ATM4OCN?g
-s?@USE_DATA_ATM4OCN?$USE_DATA_ATM4OCN?g
+s?@MODELATM?$MODELATM?g
+s?@DATAATM?$DATAATM?g
 
 EOF
 

diff --git a/geoschemchem_setup b/geoschemchem_setup
@@ -958,8 +958,8 @@ endif
 # Check for Data Atmosphere
 #--------------------------
 set DATA_ATMOS = FALSE
-set ACTUAL_ATM4OCN = ""
-set USE_DATA_ATM4OCN = .FALSE.
+set MODELATM = ""
+set DATAATM = .FALSE.
 
 if( $OGCM == "TRUE" ) then
 
@@ -986,8 +986,8 @@ DATATMOS:
    endif
 
    if ($DATA_ATMOS == TRUE) then
-      set ACTUAL_ATM4OCN = "#DELETE"
-      set USE_DATA_ATM4OCN = .TRUE.
+      set MODELATM = "#DELETE"
+      set DATAATM = .TRUE.
 
       set DEFAULT_HISTORY_TEMPLATE = "HISTORY.DATAATM.rc.tmpl"
    endif
@@ -2551,8 +2551,8 @@ s?@PRELOAD_COMMAND?$PRELOAD_COMMAND?g
 s?@LD_LIBRARY_PATH_CMD?$LD_LIBRARY_PATH_CMD?g
 s?@RUN_CMD?$RUN_CMD?g
 
-s?@ACTUAL_ATM4OCN?$ACTUAL_ATM4OCN?g
-s?@USE_DATA_ATM4OCN?$USE_DATA_ATM4OCN?g
+s?@MODELATM?$MODELATM?g
+s?@DATAATM?$DATAATM?g
 
 EOF
 

diff --git a/gmichem_setup b/gmichem_setup
@@ -1055,8 +1055,8 @@ endif
 # Check for Data Atmosphere
 #--------------------------
 set DATA_ATMOS = FALSE
-set ACTUAL_ATM4OCN = ""
-set USE_DATA_ATM4OCN = .FALSE.
+set MODELATM = ""
+set DATAATM = .FALSE.
 
 if( $OGCM == "TRUE" ) then
 
@@ -1083,8 +1083,8 @@ DATATMOS:
    endif
 
    if ($DATA_ATMOS == TRUE) then
-      set ACTUAL_ATM4OCN = "#DELETE"
-      set USE_DATA_ATM4OCN = .TRUE.
+      set MODELATM = "#DELETE"
+      set DATAATM = .TRUE.
 
       set DEFAULT_HISTORY_TEMPLATE = "HISTORY.DATAATM.rc.tmpl"
    endif
@@ -2722,8 +2722,8 @@ s?@PRELOAD_COMMAND?$PRELOAD_COMMAND?g
 s?@LD_LIBRARY_PATH_CMD?$LD_LIBRARY_PATH_CMD?g
 s?@RUN_CMD?$RUN_CMD?g
 
-s?@ACTUAL_ATM4OCN?$ACTUAL_ATM4OCN?g
-s?@USE_DATA_ATM4OCN?$USE_DATA_ATM4OCN?g
+s?@MODELATM?$MODELATM?g
+s?@DATAATM?$DATAATM?g
 
 EOF