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

Adding Data Atmosphere from S2S to mainline gcm #668

Merged
merged 17 commits into from
Jan 7, 2025
Merged

Adding Data Atmosphere from S2S to mainline gcm #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8fea285
merged Michael's gcm_setup with the main branch
Dec 11, 2024
c7ef312
merg updated AGCM.rc.tmpl construct_extdata_yaml_list.py linkbcs.tmpl
Dec 11, 2024
37c2fc4
Restore CMake configure bits
mathomp4 Dec 12, 2024
d13e1d3
JRA55-DO new path
Dec 12, 2024
f9ef97e
typo fixed
Dec 12, 2024
b7364d2
Update linkbcs.tmpl
mfmehari Dec 12, 2024
4dab360
Update linkbcs.tmpl
mfmehari Dec 12, 2024
ca4355e
Update linkbcs.tmpl
mfmehari Dec 12, 2024
0da6f23
Update linkbcs.tmpl
mathomp4 Dec 12, 2024
bf35f69
Use @ not $ for COUPLEDIR
mathomp4 Dec 12, 2024
8429afe
GOCART and Land setup questions are disbaled when DataAtm is on
Dec 12, 2024
0aa45ab
Delete ACTUAL_ATM4OCN when running data atm
mathomp4 Dec 13, 2024
85cbb5f
Update to orb v4
mathomp4 Dec 13, 2024
330c8a8
Update other setup scripts
mathomp4 Dec 13, 2024
d5198b4
Merge branch 'develop' into feature/sshakoor/dataatm
sdrabenh Jan 2, 2025
43f5cdc
Move to use MODELATM and DATAATM
mathomp4 Jan 6, 2025
ba828b1
Revert DATAATM to USE_DATA_ATM4OCN
mathomp4 Jan 6, 2025
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
211 changes: 109 additions & 102 deletions AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ NY: @NY
IOSERVER_NODES: @NUM_OSERVER_NODES
NUM_BACKEND_PES: @NUM_BACKEND_PES

DATAATM.GRID_TYPE: @GRID_TYPE
DATAATM.GRIDNAME: @AGCM_GRIDNAME
DATAATM.NF: @AGCM_NF
DATAATM.LM: @AGCM_LM
DATAATM.IM_WORLD: @AGCM_IM

AGCM_IM: @AGCM_IM
AGCM_JM: @AGCM_JM
AGCM_LM: @AGCM_LM
Expand Down Expand Up @@ -579,123 +585,123 @@ MAPL_ENABLE_BOOTSTRAP: @BOOT

# Required AGCM Model Restart Files
# ---------------------------------
DYN_INTERNAL_RESTART_FILE: fvcore_internal_rst
DYN_INTERNAL_CHECKPOINT_FILE: fvcore_internal_checkpoint
DYN_INTERNAL_CHECKPOINT_TYPE: @CHECKPOINT_TYPE
DYN_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

GWD_INTERNAL_RESTART_FILE: gwd_internal_rst
GWD_INTERNAL_CHECKPOINT_FILE: gwd_internal_checkpoint
GWD_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

LAKE_INTERNAL_RESTART_FILE: lake_internal_rst
LAKE_INTERNAL_CHECKPOINT_FILE: lake_internal_checkpoint
LAKE_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

LANDICE_INTERNAL_RESTART_FILE: landice_internal_rst
LANDICE_INTERNAL_CHECKPOINT_FILE: landice_internal_checkpoint
LANDICE_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

CATCH_INTERNAL_RESTART_FILE: catch_internal_rst
CATCH_INTERNAL_CHECKPOINT_FILE: catch_internal_checkpoint
CATCH_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

CATCHCNCLM40_INTERNAL_RESTART_FILE: catchcn_internal_rst
CATCHCNCLM40_INTERNAL_CHECKPOINT_FILE: catchcn_internal_checkpoint
CATCHCNCLM40_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

MOIST_INTERNAL_RESTART_FILE: moist_internal_rst
MOIST_INTERNAL_CHECKPOINT_FILE: moist_internal_checkpoint
MOIST_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
# ---------------------------------------
AIAU_IMPORT_RESTART_FILE: aiau_import_rst
AIAU_IMPORT_CHECKPOINT_FILE: aiau_import_checkpoint
AIAU_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

GWD_IMPORT_RESTART_FILE: gwd_import_rst
GWD_IMPORT_CHECKPOINT_FILE: gwd_import_checkpoint
GWD_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

MOIST_IMPORT_RESTART_FILE: moist_import_rst
MOIST_IMPORT_CHECKPOINT_FILE: moist_import_checkpoint
MOIST_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

SOLAR_INTERNAL_RESTART_FILE: solar_internal_rst
SOLAR_INTERNAL_CHECKPOINT_FILE: solar_internal_checkpoint
SOLAR_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

IRRAD_INTERNAL_RESTART_FILE: irrad_internal_rst
IRRAD_INTERNAL_CHECKPOINT_FILE: irrad_internal_checkpoint
IRRAD_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

TURBULENCE_INTERNAL_RESTART_FILE: turb_internal_rst
TURBULENCE_INTERNAL_CHECKPOINT_FILE: turb_internal_checkpoint
TURBULENCE_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

TURBULENCE_IMPORT_RESTART_FILE: turb_import_rst
TURBULENCE_IMPORT_CHECKPOINT_FILE: turb_import_checkpoint
TURBULENCE_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

PCHEM_INTERNAL_RESTART_FILE: pchem_internal_rst
PCHEM_INTERNAL_CHECKPOINT_FILE: pchem_internal_checkpoint
PCHEM_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

H2O_INTERNAL_RESTART_FILE: h2o_internal_rst
H2O_INTERNAL_CHECKPOINT_FILE: h2o_internal_checkpoint
H2O_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
# -------------------------------------
GOCART_IMPORT_RESTART_FILE: gocart_import_rst
GOCART_IMPORT_CHECKPOINT_FILE: gocart_import_checkpoint
GOCART_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

GOCART_INTERNAL_RESTART_FILE: gocart_internal_rst
GOCART_INTERNAL_CHECKPOINT_FILE: gocart_internal_checkpoint
GOCART_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

GOCART.data_INTERNAL_RESTART_FILE: gocartdata_internal_rst
GOCART.data_INTERNAL_CHECKPOINT_FILE: gocartdata_internal_checkpoint
GOCART.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

DU_INTERNAL_RESTART_FILE: du_internal_rst
DU_INTERNAL_CHECKPOINT_FILE: du_internal_checkpoint
DU_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

SS_INTERNAL_RESTART_FILE: ss_internal_rst
SS_INTERNAL_CHECKPOINT_FILE: ss_internal_checkpoint
SS_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

CA.oc_INTERNAL_RESTART_FILE: caoc_internal_rst
CA.oc_INTERNAL_CHECKPOINT_FILE: caoc_internal_checkpoint
CA.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

CA.bc_INTERNAL_RESTART_FILE: cabc_internal_rst
CA.bc_INTERNAL_CHECKPOINT_FILE: cabc_internal_checkpoint
CA.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

CA.br_INTERNAL_RESTART_FILE: cabr_internal_rst
CA.br_INTERNAL_CHECKPOINT_FILE: cabr_internal_checkpoint
CA.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

NI_INTERNAL_RESTART_FILE: ni_internal_rst
NI_INTERNAL_CHECKPOINT_FILE: ni_internal_checkpoint
NI_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

SU_INTERNAL_RESTART_FILE: su_internal_rst
SU_INTERNAL_CHECKPOINT_FILE: su_internal_checkpoint
SU_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

CARMA_INTERNAL_RESTART_FILE: carma_internal_rst
CARMA_INTERNAL_CHECKPOINT_FILE: carma_internal_checkpoint
CARMA_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
Expand All @@ -721,29 +727,29 @@ CARMA_INTERNAL_CHECKPOINT_TYPE: @CHECKPOINT_TYPE
#GEOSCHEMCHEM_IMPORT_CHECKPOINT_FILE: geoschemchem_import_checkpoint
#GEOSCHEMCHEM_IMPORT_CHECKPOINT_TYPE: @CHECKPOINT_TYPE

MAM_INTERNAL_RESTART_FILE: mam_internal_rst
MAM_INTERNAL_CHECKPOINT_FILE: mam_internal_checkpoint
MAM_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

ACHEM_INTERNAL_RESTART_FILE: achem_internal_rst
ACHEM_INTERNAL_CHECKPOINT_FILE: achem_internal_checkpoint
ACHEM_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

TR_INTERNAL_RESTART_FILE: tr_internal_rst
TR_INTERNAL_CHECKPOINT_FILE: tr_internal_checkpoint
TR_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

TR_IMPORT_RESTART_FILE: tr_import_rst
TR_IMPORT_CHECKPOINT_FILE: tr_import_checkpoint
TR_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

HEMCO_INTERNAL_RESTART_FILE: hemco_internal_rst
HEMCO_INTERNAL_CHECKPOINT_FILE: hemco_internal_checkpoint
HEMCO_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

HEMCO_IMPORT_RESTART_FILE: hemco_import_rst
HEMCO_IMPORT_CHECKPOINT_FILE: hemco_import_checkpoint
HEMCO_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
Expand Down Expand Up @@ -831,9 +837,9 @@ TILING_FILE: tile.bin
VISDF_FILE: visdf.dat
NIRDF_FILE: nirdf.dat
LNFM_FILE: lnfm.data
@COUPLED ROUTING_FILE: runoff.bin
@MODELATM@COUPLED ROUTING_FILE: runoff.bin

VEGDYN_INTERNAL_RESTART_FILE: vegdyn.data
@MODELATMVEGDYN_INTERNAL_RESTART_FILE: vegdyn.data

KPAR_FILE: SEAWIFS_KPAR_mon_clim.data

Expand Down Expand Up @@ -941,6 +947,7 @@ USE_WAVES: 0
@COUPLED # ----------------
@COUPLED USE_DATASEA:0
@COUPLED OCEAN_NAME: @OCEAN_NAME
@COUPLED USE_DATA_ATM4OCN: @USE_DATA_ATM4OCN
@COUPLED USE_DATASEAICE:0
@COUPLED steady_state_ocean: 0
@COUPLED OCEAN_PICE_SCALING: 0.0
Expand Down
Loading
Loading