Skip to content

Commit

Permalink
Merge pull request #422 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history 
Gitflow: develop into  main
  • Loading branch information
@mathomp4
mathomp4 authored Mar 10, 2023
2 parents c31972b + a55809a commit 2c6f978
Show file tree
Hide file tree
Showing 18 changed files with 3,837 additions and 531 deletions.
2 changes: 1 addition & 1 deletion .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.23.0
bcs_version: &bcs_version v10.25.0

orbs:
ci: geos-esm/circleci-tools@1
Expand Down
129 changes: 72 additions & 57 deletions AGCM.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,87 +19,91 @@ AGCM_GRIDNAME: @AGCM_GRIDNAME
AGCM.IM_WORLD: @AGCM_IM
@LATLON_AGCM AGCM.JM_WORLD: @AGCM_JM

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

###########################################################
# radiation options
# ----------------------------------------
SOLAR_DT: 3600
IRRAD_DT: 3600
SATSIM_DT: 1800

SATSIM_DT: 3600
SOLARAvrg: 0
IRRADAvrg: 0

EOT: .TRUE.
ORBIT_ANAL2B: .TRUE.

# UNCOMMENT to use Morrison-Gettelman-Barahona cloud microphysics
@MP_MG1CLDMICRO: 2MOMENT

# UNCOMMENT to use GFDL 6-phase cloud microphysics
@MP_GFDLCLDMICRO: GFDL
# UNCOMMENT to when GFDL microphysics is run with NonHydrostatic FV3
@MP_GFDLHYDROSTATIC: @GFDL_HYDRO

# UNCOMMENT to disable aerosol activation in 1-moment cloud microphysics
#USE_AEROSOL_NN: 0
###########################################################

###########################################################
# Flag for definition of the convection scheme
# The options are RAS or GF
# BACM_1M microphysics options
# ----------------------------------------
CONVPAR_OPTION: GF
@BACM_1M_CLDMICR_OPTION: BACM_1M
###########################################################

# Override default aerosol convective scavenging and use dz method
USE_TRACER_SCAVEN: 1
###########################################################
# GFDL_1M microphysics options
# ----------------------------------------
@GFDL_1M_CLDMICR_OPTION: GFDL_1M
@GFDL_1M_HYDROSTATIC: @GFDL_HYDRO
###########################################################

# Flag to activated scale-awareness approach (0 false, 1 true)
USE_SCALE_DEP: 1
###########################################################
# MGB2_2M microphysics options
# ----------------------------------------
@MGB2_2M_CLDMICR_OPTION: MGB2_2M
@MGB2_2M_MGVERSION: @MGVERSION
###########################################################

# Flag to activated diurnal cycle closure (0 false, 1 true)
DICYCLE: 1
###########################################################
# shallow cumulus options
# ----------------------------------------
SHALLOW_OPTION: UW
###########################################################

# Convective plumes to be activated (1 true, 0 false)
###########################################################
# convection scheme options
# ----------------------------------------
CONVPAR_OPTION: GF
#USE_GF2020: 1
# Convective plumes to be activated (1 true, 0 false)
DEEP: 1
SHALLOW: 0
CONGESTUS: 1

# UW shallow cumulus settings
DOSHLW: 1

# Choice for the closures:
# ----------------------------------------
# deep : 0 ensemble (all) , 1 GR, 4 ll omega, 7 moist conv, 10 PB
# shallow : 0 ensemble (Wstar/BLQE) , 1 Wstar, 4 heat-engine or 7 BLQE
# congestus: 0 ensemble (Wstar/BLQE/PB), 1 Wstar, 2 BLQE, 3 PB, 4 PB_BL
CLOSURE_DEEP:0
CLOSURE_SHALLOW:7
CLOSURE_CONGESTUS:3

# GWD Parameterization
# --------------------

# if .FALSE., use GEOS GWD code (default); .TRUE., use new NCAR GWD code
USE_NCAR_GWD: .FALSE.
CLOSURE_DEEP: 0
CLOSURE_SHALLOW: 7
CLOSURE_CONGESTUS: 3
###########################################################

# This is only used if USE_NCAR_GWD is .TRUE.
BERES_FILE_NAME: ExtData/g5gcm/gwd/newmfspectra40_dc25.nc
###########################################################
# TRB/GWD Parameterization
# ------------------------
###########################################################

###########################################################
# Ocean Model Configuration Parameters
# ------------------------------------
OGCM.GRID_TYPE: @OGCM_GRID_TYPE
OGCM.GRIDNAME: @OGCM_GRIDNAME
OGCM.IM_WORLD: @OGCM_IM
OGCM.JM_WORLD: @OGCM_JM
OGCM.LM: @OGCM_LM
@COUPLED OGCM.NX: @OGCM_NX
@COUPLED OGCM.NY: @OGCM_NY
@COUPLED OGCM.GRIDSPEC: MAPL_Tripolar.nc

@DATAOCEAN @LATLON_OGCM OGCM.POLE: 'PE'
@DATAOCEAN @LATLON_OGCM OGCM.DATELINE: 'DE'
@DATAOCEAN @CUBE_OGCM OGCM.NF: @OGCM_NF

OGCM.GRID_TYPE: @OGCM_GRID_TYPE
OGCM.GRIDNAME: @OGCM_GRIDNAME
OGCM.IM_WORLD: @OGCM_IM
OGCM.JM_WORLD: @OGCM_JM
OGCM.LM: @OGCM_LM
@COUPLED OGCM.NX: @OGCM_NX
@COUPLED OGCM.NY: @OGCM_NY
@COUPLED OGCM.GRIDSPEC: MAPL_Tripolar.nc
@DATAOCEAN @LATLON_OGCM OGCM.POLE: 'PE'
@DATAOCEAN @LATLON_OGCM OGCM.DATELINE: 'DE'
@DATAOCEAN @CUBE_OGCM OGCM.NF: @OGCM_NF
OGCM_RUN_DT: @OCEAN_DT
###########################################################

##############################################################################################
#### ####
Expand Down Expand Up @@ -278,8 +282,17 @@ RECORD_REF_TIME: >>>REFTIME<<< >>>FCSTIME<<<

# ANA EXPID and LOCATION used for REPLAY
# --------------------------------------
# REPLAY_ANA_EXPID: @REPLAY_ANA_EXPID
# REPLAY_ANA_LOCATION: @REPLAY_ANA_LOCATION
#X_EXP REPLAY_ANA_EXPID: @ANA_EXPID
#X_EXP REPLAY_ANA_LOCATION: /discover/nobackup/projects/gmao/dadev/dao_it/archive/@ANA_EXPID
#X_EXP REPLAY_MODE: Regular
#X_EXP REPLAY_FILE: ana/Y%y4/M%m2/@ANA_EXPID.ana.eta.%y4%m2%d2_%h2%n2z.nc4

# Regular REPLAY to ERA5
# ----------------------
#ERA5 REPLAY_ANA_EXPID: era5_eta2eta_L137
#ERA5 REPLAY_ANA_LOCATION: /discover/nobackup/projects/gmao/osse2/Ops12KM_R/forecasts_EC/ERA5/UV
#ERA5 REPLAY_MODE: Regular
#ERA5 REPLAY_FILE: /discover/nobackup/projects/gmao/osse2/Ops12KM_R/forecasts_EC/ERA5/UV/%y4%m2%d2_%h20000/era5_eta2eta_L137.%y4%m2%d2_%h2z.nc4

# Typical Exact REPLAY Configuration
# ----------------------------------
Expand Down Expand Up @@ -465,8 +478,6 @@ RECORD_REF_TIME: >>>REFTIME<<< >>>FCSTIME<<<
##############################################################################################

# Option to Diagnose Precipitation Types for Land Surface
# ------------------------------------------------------------
DIAGNOSE_PRECIP_TYPE: FALSE

# Choice for Land Surface Model
# 1 : Catchment
Expand Down Expand Up @@ -526,6 +537,10 @@ DYN_INTERNAL_CHECKPOINT_FILE: fvcore_internal_checkpoint
DYN_INTERNAL_CHECKPOINT_TYPE: @CHECKPOINT_TYPE
DYN_INTERNAL_HEADER: 1

GWD_INTERNAL_RESTART_FILE: gwd_internal_rst
GWD_INTERNAL_CHECKPOINT_FILE: gwd_internal_checkpoint
GWD_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
Expand Down
2 changes: 1 addition & 1 deletion CAP.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ FCST_SEGMENT: 00000000
#PERPETUAL_MONTH: MM
#PERPETUAL_DAY: DD

MAPL_ENABLE_TIMERS: NO
MAPL_ENABLE_TIMERS: YES
MAPL_ENABLE_MEMUTILS: NO
PRINTSPEC: 0 # (0: OFF, 1: IMPORT & EXPORT, 2: IMPORT, 3: EXPORT)

75 changes: 40 additions & 35 deletions HISTORY.AGCM.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,16 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'QS' , 'SURFACE' ,
'THAT' , 'SURFACE' ,
'QHAT' , 'SURFACE' ,
'CU2DRAINMOVE' , 'MOIST' ,
'CU2DSNOWMOVE' , 'MOIST' ,
'RAS_TIME' , 'MOIST' ,
'CN_PRCP' , 'MOIST' , 'CNPRCP' ,
'LS_PRCP' , 'MOIST' , 'LSPRCP' ,
'AN_PRCP' , 'MOIST' , 'ANPRCP' ,
'LS_PRCP+CU2DRAINMOVE+CU2DSNOWMOVE' , 'MOIST' , 'LSORIG' ,
'CN_PRCP-CU2DRAINMOVE-CU2DSNOWMOVE' , 'MOIST' , 'CNORIG' ,
'SNO' , 'MOIST' ,
'PLS' , 'MOIST' ,
'PCU' , 'MOIST' ,
'ICE' , 'MOIST' ,
'FRZR' , 'MOIST' ,
'RAIN' , 'MOIST' ,
'PTYPE' , 'MOIST' ,
'LWP' , 'MOIST' ,
'CCWP' , 'MOIST' ,
'TAUTT' , 'SOLAR' ,
Expand Down Expand Up @@ -456,6 +455,7 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'RI' , 'MOIST' , 'RICE' ,
'RL' , 'MOIST' , 'RLIQ' ,
'RH1' , 'MOIST' ,
'CNV_FRC' , 'MOIST' ,
'CNV_MF0' , 'MOIST' , 'CNVMF0' ,
'CNV_MFD' , 'MOIST' , 'CNVMFD' ,
'CNV_MFC' , 'MOIST' , 'CNVMFC' ,
Expand All @@ -465,7 +465,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 @@ -566,7 +565,8 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'DQDT' , 'MOIST' , 'DQVDTMST' ,
'QVIT' , 'PHYSICS' , 'DQVDTTRB' ,
'H2O_TEND' , 'CHEMISTRY' , 'DQVDTCHM' ,
'DPDTPHY' , 'PHYSICS' ,
'DPDTPHY' , 'PHYSICS' ,
'DQVDTSCL' , 'PHYSICS' ,
::

geosgcm_budi.template: '%y4%m2%d2_%h2%n2z.nc4' ,
Expand Down Expand Up @@ -615,27 +615,32 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'DOXDTCHMINT' , 'PHYSICS' , 'DOXDTCHM' ,
::

geosgcm_iau.template: '%y4%m2%d2_%h2%n2z.nc4' ,
geosgcm_iau.archive: '%c/Y%y4' ,
geosgcm_iau.format: 'CFIO' ,
geosgcm_iau.deflate: 1 ,
geosgcm_iau.grid_label: PC@HIST_IMx@HIST_JM-DC ,
geosgcm_iau.regrid_method: 'BILINEAR',
geosgcm_iau.mode: 'time-averaged' ,
# geosgcm_iau.monthly: 1 ,
geosgcm_iau.frequency: 060000 ,
geosgcm_iau.ref_time: 030000 ,
geosgcm_iau.vscale: 100.0 ,
geosgcm_iau.vunit: 'hPa' ,
geosgcm_iau.vvars: 'log(PLE)' , 'DYN' ,
geosgcm_iau.levels: 1000 975 950 925 900 875 850 825 800 775 750 725 700 650 600 550 500 450 400 350 300 250 200 150 100 70 50 40 30 20 10 7 5 4 3 2 1 0.7 0.5 0.4 0.3 0.2 0.1 0.07 0.05 0.04 0.03 0.02 ,
geosgcm_iau.fields: 'DUDT_ANA;DVDT_ANA' , 'AGCM' , 'DUDTANA;DVDTANA' ,
'DTDT_ANA' , 'AGCM' , 'DTDTANA' ,
'DQVDT_ANA' , 'AGCM' , 'DQDTANA' ,
'DMDTANA' , 'DYN' , 'DMDTANA' ,
'DPSDT_CON' , 'AGCM' , 'DPDTCON' ,
'DQVDT_CON' , 'AGCM' , 'DQDTCON' ,
::
geosgcm_iau.template: '%y4%m2%d2_%h2%n2z.nc4',
geosgcm_iau.archive: '%c/Y%y4',
geosgcm_iau.format: 'CFIO',
geosgcm_iau.deflate: 1,
geosgcm_iau.grid_label: PC@HIST_IMx@HIST_JM-DC,
geosgcm_iau.regrid_method: 'BILINEAR',
geosgcm_iau.mode: 'time-averaged',
# geosgcm_iau.monthly: 1,
geosgcm_iau.frequency: 060000,
geosgcm_iau.ref_time: 030000,
geosgcm_iau.vscale: 100.0,
geosgcm_iau.vunit: 'hPa',
geosgcm_iau.vvars: 'log(PLE)' , 'DYN' ,
geosgcm_iau.levels: 1000 975 950 925 900 875 850 825 800 775 750 725 700 650 600 550 500 450 400 350 300 250 200 150 100 70 50 40 30 20 10 7 5 4 3 2 1 0.7 0.5 0.4 0.3 0.2 0.1 0.07 0.05 0.04 0.03 0.02,
geosgcm_iau.fields: 'DUDT_ANA;DVDT_ANA' , 'AGCM' , 'DUDTANA;DVDTANA' ,
'DTDT_ANA' , 'AGCM' , 'DTDTANA' ,
'DQVDT_ANA' , 'AGCM' , 'DQDTANA' ,
'DMDTANA' , 'DYN' , 'DMDTANA' ,
'DPSDT_CON' , 'AGCM' , 'DPDTCON' ,
'DQVDT_CON' , 'AGCM' , 'DQDTCON' ,
'QVBKG' , 'AGCM' ,
'QVANA' , 'AGCM' ,
'QVCON' , 'AGCM' ,
'DPBKG' , 'AGCM' ,
'DPANA' , 'AGCM' ,
::

# Note: Be Sure to ADD: USE_SATSIM_MODIS: 1 in AGCM.rc for this Collection
# ------------------------------------------------------------------------
Expand Down Expand Up @@ -975,13 +980,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
Loading

0 comments on commit 2c6f978

Please sign in to comment.