Skip to content

Commit

Permalink
Merge pull request #458 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history 
Sync develop into main
  • Loading branch information
@mathomp4
mathomp4 committed May 10, 2023
2 parents 2c6f978 + ccf6f8c commit b4d20b4
Show file tree
Hide file tree
Showing 24 changed files with 1,522 additions and 1,385 deletions.
20 changes: 18 additions & 2 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

# Anchors to prevent forgetting to update a version
baselibs_version: &baselibs_version v7.7.0
bcs_version: &bcs_version v10.25.0
bcs_version: &bcs_version v11.00.0

orbs:
ci: geos-esm/circleci-tools@1
Expand All @@ -23,7 +23,8 @@ workflows:
checkout_fixture: true
mepodevelop: true
persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
# Run GCM (1 hour, no ExtData)

# Run AMIP GCM (1 hour, no ExtData)
- ci/run_gcm:
name: run-GCM-on-<< matrix.compiler >>
context:
Expand All @@ -37,3 +38,18 @@ workflows:
baselibs_version: *baselibs_version
bcs_version: *bcs_version

# Run Coupled GCM (1 hour, no ExtData)
- ci/run_gcm:
name: run-coupled-GCM-on-<< matrix.compiler >>
context:
- docker-hub-creds
matrix:
parameters:
compiler: [gfortran, ifort]
requires:
- build-GEOSgcm-on-<< matrix.compiler >>
repo: GEOSgcm
baselibs_version: *baselibs_version
bcs_version: *bcs_version
gcm_ocean_type: MOM6
change_layout: false
62 changes: 46 additions & 16 deletions AGCM.rc.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,54 @@

# Atmospheric Model Configuration Parameters
# ------------------------------------------
NX: @NX
NY: @NY
NX: @NX
NY: @NY

IOSERVER_NODES: @NUM_OSERVER_NODES
IOSERVER_NODES: @NUM_OSERVER_NODES
NUM_BACKEND_PES: @NUM_BACKEND_PES

AGCM_IM: @AGCM_IM
AGCM_JM: @AGCM_JM
AGCM_LM: @AGCM_LM
AGCM_IM: @AGCM_IM
AGCM_JM: @AGCM_JM
AGCM_LM: @AGCM_LM
AGCM_GRIDNAME: @AGCM_GRIDNAME

AGCM.GRID_TYPE: @GRID_TYPE
AGCM.GRIDNAME: @AGCM_GRIDNAME
@CUBE_AGCM AGCM.NF: @AGCM_NF
AGCM.LM: @AGCM_LM
AGCM.IM_WORLD: @AGCM_IM
@LATLON_AGCM AGCM.JM_WORLD: @AGCM_JM
AGCM.GRID_TYPE: @GRID_TYPE
AGCM.GRIDNAME: @AGCM_GRIDNAME
@CUBE_AGCM AGCM.NF: @AGCM_NF
AGCM.LM: @AGCM_LM
AGCM.IM_WORLD: @AGCM_IM
@LATLON_AGCM AGCM.JM_WORLD: @AGCM_JM

@CONUS AGCM.STRETCH_FACTOR: @STRETCH_FACTOR
@CONUS AGCM.TARGET_LAT: 39.5
@CONUS AGCM.TARGET_LON: -98.35

###########################################################
# long physics DT options
# ----------------------------------------
ADJUST_DT: .FALSE.
CHEMISTRY_RUN_AT_INTERVAL_START: .TRUE.
CHEMISTRY_DT: @LONG_DT
GOCART_DT: @LONG_DT
HEMCO_DT: @LONG_DT
GF_DT: @LONG_DT
UW_DT: @LONG_DT
###########################################################

###########################################################
# dynamics options
# ----------------------------------------
DYCORE: @DYCORE
#FV3_CONFIG: MONOTONIC
@CONUS FV3_CONFIG: HWT
AdvCore_Advection: 0
###########################################################

###########################################################
# radiation options
# ----------------------------------------
SOLAR_DT: 3600
IRRAD_DT: 3600
SATSIM_DT: 3600
SOLAR_DT: @SOLAR_DT
IRRAD_DT: @IRRAD_DT
SATSIM_DT: @IRRAD_DT
SOLARAvrg: 0
IRRADAvrg: 0
EOT: .TRUE.
Expand Down Expand Up @@ -88,6 +104,20 @@ CLOSURE_CONGESTUS: 3
# ------------------------
###########################################################

>>>HIST_GOCART<<<###########################################################
>>>HIST_GOCART<<<# Enable wet scavenging
>>>HIST_GOCART<<<# NOTE: this section should be commented out when running gocart.data
>>>HIST_GOCART<<<MCHEMTRI_increments::
>>>HIST_GOCART<<<DU::DU default
>>>HIST_GOCART<<<SS::SS default
>>>HIST_GOCART<<<SU::SO4 default
>>>HIST_GOCART<<<CA.bc::CA.bcphilic default
>>>HIST_GOCART<<<CA.br::CA.brphilic default
>>>HIST_GOCART<<<CA.oc::CA.ocphilic default
>>>HIST_GOCART<<<NI::NO3an1 "NI::NO3an2,NI::NO3an3"
>>>HIST_GOCART<<<::
>>>HIST_GOCART<<<###########################################################

###########################################################
# Ocean Model Configuration Parameters
# ------------------------------------
Expand Down
23 changes: 16 additions & 7 deletions HISTORY.AGCM.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,15 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'ASNOW' , 'SURFACE' ,
'RADSRF' , 'RADIATION' ,
'TBISCCP' , 'SATSIM' ,
'DBZ_MAX' , 'MOIST' , 'DBZMAX' , 'MAX' ,
'DBZ_TOP' , 'MOIST' , 'DBZTOP' , 'MAX' ,
'DBZ_1KM' , 'MOIST' , 'DBZ1KM' , 'MAX' ,
'DBZ_M10C' , 'MOIST' , 'DBZM10C' , 'MAX' ,
'UH25' , 'DYN' , 'UH25MX' , 'MAX' ,
'UH03' , 'DYN' , 'UH03MX' , 'MAX' ,
'SRH25' , 'DYN' , 'SRH25MX' , 'MAX' ,
'SRH03' , 'DYN' , 'SRH03MX' , 'MAX' ,
'SRH01' , 'DYN' , 'SRH01MX' , 'MAX' ,
'FLNS' , 'IRRAD' ,
'FLNSC' , 'IRRAD' ,
'FLNSA' , 'IRRAD' , 'FLNSCNA' ,
Expand Down Expand Up @@ -980,15 +989,15 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'NH4WT' , 'NI' ,
'NIFLUXU' , 'NI' ,
'NIFLUXV' , 'NI' ,
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'NH3SV' , 'NI' ,
'NH4SV' , 'NI' ,
'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
'MCHEMTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
'MCHEMTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
'MCHEMTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
'MCHEMTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
::

tavg3d_aer_p.template: '%y4%m2%d2_%h2%n2z.nc4',
Expand Down
15 changes: 7 additions & 8 deletions HISTORY.AOGCM-MOM5.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,6 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'RSU_CN' , 'MOIST' , 'RSUCN' ,
'RSU_AN' , 'MOIST' , 'RSUAN' ,
'RSU_LS' , 'MOIST' , 'RSULS' ,
'THIM' , 'PHYSICS' ,
'EVAPC' , 'MOIST' ,
'SUBLC' , 'MOIST' ,
'FCLD' , 'MOIST' ,
Expand Down Expand Up @@ -991,13 +990,13 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'NH4WT' , 'NI' ,
'NIFLUXU' , 'NI' ,
'NIFLUXV' , 'NI' ,
'DDU2gDT' , 'MOIST' , 'DUSV' ,
'DSS2gDT' , 'MOIST' , 'SSSV' ,
'DOC2gDT' , 'MOIST' , 'OCSV' ,
'DBC2gDT' , 'MOIST' , 'BCSV' ,
'DSU2gDT' , 'MOIST' , 'SUSV' ,
'DNI2gDT' , 'MOIST' , 'NISV' ,
'DBRC2gDT' , 'MOIST' , 'BRSV' ,
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'NH3SV' , 'NI' ,
'NH4SV' , 'NI' ,
::
Expand Down
15 changes: 7 additions & 8 deletions HISTORY.AOGCM.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,6 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'RSU_CN' , 'MOIST' , 'RSUCN' ,
'RSU_AN' , 'MOIST' , 'RSUAN' ,
'RSU_LS' , 'MOIST' , 'RSULS' ,
'THIM' , 'PHYSICS' ,
'EVAPC' , 'MOIST' ,
'SUBLC' , 'MOIST' ,
'FCLD' , 'MOIST' ,
Expand Down Expand Up @@ -988,13 +987,13 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'NH4WT' , 'NI' ,
'NIFLUXU' , 'NI' ,
'NIFLUXV' , 'NI' ,
'DDU2gDT' , 'MOIST' , 'DUSV' ,
'DSS2gDT' , 'MOIST' , 'SSSV' ,
'DOC2gDT' , 'MOIST' , 'OCSV' ,
'DBC2gDT' , 'MOIST' , 'BCSV' ,
'DSU2gDT' , 'MOIST' , 'SUSV' ,
'DNI2gDT' , 'MOIST' , 'NISV' ,
'DBRC2gDT' , 'MOIST' , 'BRSV' ,
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'NH3SV' , 'NI' ,
'NH4SV' , 'NI' ,
::
Expand Down
19 changes: 9 additions & 10 deletions HISTORY.BENCHMARK.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,6 @@ PC23040x11521-DC.LM: 181
'RSU_CN' , 'MOIST' , 'RSUCN' ,
'RSU_AN' , 'MOIST' , 'RSUAN' ,
'RSU_LS' , 'MOIST' , 'RSULS' ,
'THIM' , 'PHYSICS' ,
'EVAPC' , 'MOIST' ,
'SUBLC' , 'MOIST' ,
'FCLD' , 'MOIST' ,
Expand Down Expand Up @@ -1057,15 +1056,15 @@ PC23040x11521-DC.LM: 181
'NH4WT' , 'NI' ,
'NIFLUXU' , 'NI' ,
'NIFLUXV' , 'NI' ,
'DDU2gDT' , 'MOIST' , 'DUSV' ,
'DSS2gDT' , 'MOIST' , 'SSSV' ,
'DOC2gDT' , 'MOIST' , 'OCSV' ,
'DBC2gDT' , 'MOIST' , 'BCSV' ,
'DSU2gDT' , 'MOIST' , 'SUSV' ,
'DNI2gDT' , 'MOIST' , 'NISV' ,
'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'DNH32gDT' , 'MOIST' , 'NH3SV' ,
'DNH4A2gDT' , 'MOIST' , 'NH4SV' ,
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
# 'DNH32gDT' , 'MOIST' , 'NH3SV' ,
# 'DNH4A2gDT' , 'MOIST' , 'NH4SV' ,
::

tavg3d_aer_p.template: '%y4%m2%d2_%h2%n2z.nc4',
Expand Down
14 changes: 7 additions & 7 deletions HISTORY.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.bcEMBB' , 'CA.bc' , 'BCEMBB' ,
'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' ,
'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
'MTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
# Brown Carbon
'CA.brEM' , 'CA.br' , 'BREM001;BREM002' ,
'CA.brDP' , 'CA.br' , 'BRDP001;BRDP002' ,
Expand All @@ -1488,19 +1488,19 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.brEMAN' , 'CA.br' , 'BREMAN' ,
'CA.brPSOA' , 'CA.br' , 'BRPSOA' ,
'CA.brHYPHIL' , 'CA.br' , 'BRHYPHIL' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
# Dust
'DUEM' , 'DU' , 'DUEM001;DUEM002;DUEM003;DUEM004;DUEM005',
'DUSD' , 'DU' , 'DUSD001;DUSD002;DUSD003;DUSD004;DUSD005',
'DUDP' , 'DU' , 'DUDP001;DUDP002;DUDP003;DUDP004;DUDP005',
'DUWT' , 'DU' , 'DUWT001;DUWT002;DUWT003;DUWT004;DUWT005',
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
# Seasalt
'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005',
'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005',
'SSDP' , 'SS' , 'SSDP001;SSDP002;SSDP003;SSDP004;SSDP005',
'SSWT' , 'SS' , 'SSWT001;SSWT002;SSWT003;SSWT004;SSWT005',
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
# Sulfates
'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004',
'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004',
Expand All @@ -1516,7 +1516,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'SO2EMBB' , 'SU' ,
'SO2EMVN' , 'SU' ,
'SO2EMVE' , 'SU' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
'MTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
# Organic Carbon
'CA.ocEM' , 'CA.oc' , 'OCEM001;OCEM002' ,
'CA.ocDP' , 'CA.oc' , 'OCDP001;OCDP002' ,
Expand All @@ -1527,7 +1527,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' ,
'CA.ocPSOA' , 'CA.oc' , 'OCPSOA' ,
'CA.ocHYPHIL' , 'CA.oc' , 'OCHYPHIL' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
# Nitrate
'NIPNO3AQ' , 'NI' ,
'NIPNH4AQ' , 'NI' ,
Expand All @@ -1544,7 +1544,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'NH4DP' , 'NI' ,
'NH4WT' , 'NI' ,
'NH4SV' , 'NI' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
::

tavg3_2d_chm_Nx-.format: 'CFIO' ,
Expand Down
Loading

0 comments on commit b4d20b4

Please sign in to comment.