Skip to content

Commit

Permalink
Merge branch 'develop' into feature/wjiang/GEOS_GigaTraj
Browse files Browse the repository at this point in the history
  • Loading branch information
@sdrabenh
sdrabenh authored Dec 20, 2024
2 parents 07d99ac + a1d4ca8 commit 4eb79f7
Show file tree
Hide file tree
Showing 19 changed files with 350 additions and 364 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
version: 2.1

# Anchors in case we need to override the defaults from the orb
#baselibs_version: &baselibs_version v7.23.0
#bcs_version: &bcs_version v11.5.0
#baselibs_version: &baselibs_version v7.27.0
#bcs_version: &bcs_version v11.6.0

orbs:
ci: geos-esm/circleci-tools@2
ci: geos-esm/circleci-tools@4

workflows:
build-test:
Expand Down
56 changes: 28 additions & 28 deletions AGCM.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,21 +361,21 @@ RECORD_REF_TIME: >>>REFTIME<<< >>>FCSTIME<<<

# 4DIAU (recreate analysis tendency on the fly)
# ---------------------------------------------
#>>>4DIAUDAS<<< AINC_FILE: @EXPID.ana.eta.%y4%m2%d2_%h2%n2z.nc4
#>>>4DIAUDAS<<< NUDGE_STATE: YES
##>>>4DIAUDAS<<< TAUANL: 3600
#>>>4DIAUDAS<<< AGCM_IMPORT_RESTART_FILE: agcm_import_rst.>>>ANA0YYYYMMDDHHMN<<<z.nc4
#>>>4DIAUDAS<<< AGCM_IMPORT_RESTART_TYPE: binary
#@4DIAUDAS AINC_FILE: @EXPID.ana.eta.%y4%m2%d2_%h2%n2z.nc4
#@4DIAUDAS NUDGE_STATE: YES
##@4DIAUDAS TAUANL: 3600
#@4DIAUDAS AGCM_IMPORT_RESTART_FILE: agcm_import_rst.>>>ANA0YYYYMMDDHHMN<<<z.nc4
#@4DIAUDAS AGCM_IMPORT_RESTART_TYPE: binary

# Exact REPLAY Mode for 4D-IAU
# ----------------------------
>>>4DIAUDAS<<< REPLAY_MODE: Exact
>>>4DIAUDAS<<< REPLAY_FILE: agcm_import_rst.%y4%m2%d2_%h2%n2z.nc4
>>>4DIAUDAS<<< REPLAY_FILE_FREQUENCY: 7200
>>>4DIAUDAS<<< REPLAY_SHUTOFF: 21600.0 # ShutOff Replay after 6-hours for G5NCEP and G5ECMWF Forecasts
@4DIAUDAS REPLAY_MODE: Exact
@4DIAUDAS REPLAY_FILE: agcm_import_rst.%y4%m2%d2_%h2%n2z.nc4
@4DIAUDAS REPLAY_FILE_FREQUENCY: 7200
@4DIAUDAS REPLAY_SHUTOFF: 21600.0 # ShutOff Replay after 6-hours for G5NCEP and G5ECMWF Forecasts

#>>>4DIAUDAS<<< REPLAY_INTERVAL: 3600.0
#>>>4DIAUDAS<<< PREDICTOR_OFFSET: 3600.0
#@4DIAUDAS REPLAY_INTERVAL: 3600.0
#@4DIAUDAS PREDICTOR_OFFSET: 3600.0

####################################################################################################
#### Miscellaneous Exact/Regular REPLAY Parameters ####
Expand Down Expand Up @@ -408,22 +408,22 @@ RECORD_REF_TIME: >>>REFTIME<<< >>>FCSTIME<<<
# REPLAY_V: YES or NO # (Default: YES)
# REPLAY_T: YES or NO # (Default: YES)
# REPLAY_QV: YES or NO # (Default: YES)
>>>REGULAR_REPLAY_GMAO<<< REPLAY_O3: YES or NO # (Default: YES)
>>>REGULAR_REPLAY_NCEP<<< REPLAY_O3: YES or NO # (Default: YES)
>>>REGULAR_REPLAY_ECMWF<<< REPLAY_O3: YES or NO # (Default: YES)
@REGULAR_REPLAY_GMAO REPLAY_O3: YES or NO # (Default: YES)
@REGULAR_REPLAY_NCEP REPLAY_O3: YES or NO # (Default: YES)
@REGULAR_REPLAY_ECMWF REPLAY_O3: YES or NO # (Default: YES)
# REPLAY_TS: YES or NO # (Default: NO)
#
# Regular REPLAY Remapping and Blending Variables
# -----------------------------------------------
# REPLAY_REMAP: YES # Default = YES, Remap ANA Data to BKG Topography
>>>REGULAR_REPLAY_ECMWF<<< REPLAY_DAMPBEG: 1000.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
>>>REGULAR_REPLAY_ECMWF<<< REPLAY_DAMPEND: 5000.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
>>>REGULAR_REPLAY_GMAO<<< REPLAY_DAMPBEG: 100.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
>>>REGULAR_REPLAY_GMAO<<< REPLAY_DAMPEND: 5000.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
>>>REGULAR_REPLAY_NCEP<<< REPLAY_DAMPBEG: 1000.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
>>>REGULAR_REPLAY_NCEP<<< REPLAY_DAMPEND: 5000.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
>>>REGULAR_REPLAY<<< REPLAY_SHUTOFF: 21600 # ShutOff Replay after 6-hours of Integration
>>>REGULAR_REPLAY<<< REPLAY_WINDFIX: YES # Apply windfix to force vertically-integrated analysis divergence increment to zero
@REGULAR_REPLAY_ECMWF REPLAY_DAMPBEG: 1000.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
@REGULAR_REPLAY_ECMWF REPLAY_DAMPEND: 5000.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
@REGULAR_REPLAY_GMAO REPLAY_DAMPBEG: 100.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
@REGULAR_REPLAY_GMAO REPLAY_DAMPEND: 5000.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
@REGULAR_REPLAY_NCEP REPLAY_DAMPBEG: 1000.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
@REGULAR_REPLAY_NCEP REPLAY_DAMPEND: 5000.0 # Default = 1, Linearly Damp Increments between DAMPBEG & DAMPEND (Pascals)
@REGULAR_REPLAY REPLAY_SHUTOFF: 21600 # ShutOff Replay after 6-hours of Integration
@REGULAR_REPLAY REPLAY_WINDFIX: YES # Apply windfix to force vertically-integrated analysis divergence increment to zero
#
# REPLAY_BLEND_QV_AT_TP: .FALSE. # Default = FALSE, Blend QV to BKG upwards from tropopause
#
Expand Down Expand Up @@ -566,14 +566,14 @@ LSM_CHOICE: @LSM_CHOICE
# AGCM_INTERNAL = BIAS Correction Increment: BIAS(n+1) = ALPHA*IAU(n) + BETA*BIAS(n)
# ----------------------------------------------------------------------------------

>>>FORCEDAS<<<AGCM_IMPORT_RESTART_FILE: agcm_import_rst
@FORCEDASAGCM_IMPORT_RESTART_FILE: agcm_import_rst

>>>FORCEGCM<<<AGCM_INTERNAL_RESTART_FILE: agcm_internal_rst
>>>FORCEGCM<<<AGCM_INTERNAL_CHECKPOINT_FILE: agcm_internal_checkpoint
>>>FORCEGCM<<<AGCM_INTERNAL_CHECKPOINT_TYPE: @CHECKPOINT_TYPE
@FORCEGCMAGCM_INTERNAL_RESTART_FILE: agcm_internal_rst
@FORCEGCMAGCM_INTERNAL_CHECKPOINT_FILE: agcm_internal_checkpoint
@FORCEGCMAGCM_INTERNAL_CHECKPOINT_TYPE: @CHECKPOINT_TYPE

>>>FORCEGCM<<<AGCM_ALPHA: 0.000
>>>FORCEGCM<<<AGCM_BETA: 1.000
@FORCEGCMAGCM_ALPHA: 0.000
@FORCEGCMAGCM_BETA: 1.000

MAPL_ENABLE_BOOTSTRAP: @BOOT

Expand Down
76 changes: 38 additions & 38 deletions HISTORY.AGCM.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,44 +272,44 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'PHIW' , 'SURFACE' ,
'TAUTW' , 'SURFACE' ,
'ZETA_W' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNLAI' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNTLAI' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNSAI' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNTOTC' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNVEGC' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNROOT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNFROOTC' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNNPP' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNGPP' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNSR' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNNEE' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNXSMR' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNADD' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'PARABS' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'PARINC' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'SCSAT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'SCUNS' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'BTRANT' , 'SURFACE' , 'BTRAN' ,
>>>HIST_CATCHCN<<< 'SIF' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNLOSS' , 'SURFACE' , 'CLOSS' ,
>>>HIST_CATCHCN<<< 'CNBURN' , 'SURFACE' , 'BURN' ,
>>>HIST_CATCHCN<<< 'CNFSEL' , 'SURFACE' , 'FSEL' ,
>>>HIST_CATCHCN<<< 'EVPICE' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'EVPSNO' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'EVPINT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'EVPSOI' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'EVPVEG' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'FRSAT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'FRUST' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'FRWLT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'TPSAT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'TPUNST' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'TPWLT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'TPSURF' , 'SURFACE' , 'TSURF' ,
>>>HIST_CATCHCN<<< 'GHTSKIN' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'WAT10CM' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'WATSOI' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'ICESOI' , 'SURFACE' ,
@HIST_CATCHCN 'CNLAI' , 'SURFACE' ,
@HIST_CATCHCN 'CNTLAI' , 'SURFACE' ,
@HIST_CATCHCN 'CNSAI' , 'SURFACE' ,
@HIST_CATCHCN 'CNTOTC' , 'SURFACE' ,
@HIST_CATCHCN 'CNVEGC' , 'SURFACE' ,
@HIST_CATCHCN 'CNROOT' , 'SURFACE' ,
@HIST_CATCHCN 'CNFROOTC' , 'SURFACE' ,
@HIST_CATCHCN 'CNNPP' , 'SURFACE' ,
@HIST_CATCHCN 'CNGPP' , 'SURFACE' ,
@HIST_CATCHCN 'CNSR' , 'SURFACE' ,
@HIST_CATCHCN 'CNNEE' , 'SURFACE' ,
@HIST_CATCHCN 'CNXSMR' , 'SURFACE' ,
@HIST_CATCHCN 'CNADD' , 'SURFACE' ,
@HIST_CATCHCN 'PARABS' , 'SURFACE' ,
@HIST_CATCHCN 'PARINC' , 'SURFACE' ,
@HIST_CATCHCN 'SCSAT' , 'SURFACE' ,
@HIST_CATCHCN 'SCUNS' , 'SURFACE' ,
@HIST_CATCHCN 'BTRANT' , 'SURFACE' , 'BTRAN' ,
@HIST_CATCHCN 'SIF' , 'SURFACE' ,
@HIST_CATCHCN 'CNLOSS' , 'SURFACE' , 'CLOSS' ,
@HIST_CATCHCN 'CNBURN' , 'SURFACE' , 'BURN' ,
@HIST_CATCHCN 'CNFSEL' , 'SURFACE' , 'FSEL' ,
@HIST_CATCHCN 'EVPICE' , 'SURFACE' ,
@HIST_CATCHCN 'EVPSNO' , 'SURFACE' ,
@HIST_CATCHCN 'EVPINT' , 'SURFACE' ,
@HIST_CATCHCN 'EVPSOI' , 'SURFACE' ,
@HIST_CATCHCN 'EVPVEG' , 'SURFACE' ,
@HIST_CATCHCN 'FRSAT' , 'SURFACE' ,
@HIST_CATCHCN 'FRUST' , 'SURFACE' ,
@HIST_CATCHCN 'FRWLT' , 'SURFACE' ,
@HIST_CATCHCN 'TPSAT' , 'SURFACE' ,
@HIST_CATCHCN 'TPUNST' , 'SURFACE' ,
@HIST_CATCHCN 'TPWLT' , 'SURFACE' ,
@HIST_CATCHCN 'TPSURF' , 'SURFACE' , 'TSURF' ,
@HIST_CATCHCN 'GHTSKIN' , 'SURFACE' ,
@HIST_CATCHCN 'WAT10CM' , 'SURFACE' ,
@HIST_CATCHCN 'WATSOI' , 'SURFACE' ,
@HIST_CATCHCN 'ICESOI' , 'SURFACE' ,
::

geosgcm_ocn.template: '%y4%m2%d2_%h2%n2z.nc4' ,
Expand Down
76 changes: 38 additions & 38 deletions HISTORY.AOGCM-MOM5.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,44 +280,44 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'PHIW' , 'SURFACE' ,
'TAUTW' , 'SURFACE' ,
'ZETA_W' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNLAI' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNTLAI' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNSAI' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNTOTC' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNVEGC' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNROOT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNFROOTC' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNNPP' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNGPP' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNSR' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNNEE' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNXSMR' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNADD' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'PARABS' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'PARINC' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'SCSAT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'SCUNS' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'BTRANT' , 'SURFACE' , 'BTRAN' ,
>>>HIST_CATCHCN<<< 'SIF' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'CNLOSS' , 'SURFACE' , 'CLOSS' ,
>>>HIST_CATCHCN<<< 'CNBURN' , 'SURFACE' , 'BURN' ,
>>>HIST_CATCHCN<<< 'CNFSEL' , 'SURFACE' , 'FSEL' ,
>>>HIST_CATCHCN<<< 'EVPICE' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'EVPSNO' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'EVPINT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'EVPSOI' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'EVPVEG' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'FRSAT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'FRUST' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'FRWLT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'TPSAT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'TPUNST' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'TPWLT' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'TPSURF' , 'SURFACE' , 'TSURF' ,
>>>HIST_CATCHCN<<< 'GHTSKIN' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'WAT10CM' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'WATSOI' , 'SURFACE' ,
>>>HIST_CATCHCN<<< 'ICESOI' , 'SURFACE' ,
@HIST_CATCHCN 'CNLAI' , 'SURFACE' ,
@HIST_CATCHCN 'CNTLAI' , 'SURFACE' ,
@HIST_CATCHCN 'CNSAI' , 'SURFACE' ,
@HIST_CATCHCN 'CNTOTC' , 'SURFACE' ,
@HIST_CATCHCN 'CNVEGC' , 'SURFACE' ,
@HIST_CATCHCN 'CNROOT' , 'SURFACE' ,
@HIST_CATCHCN 'CNFROOTC' , 'SURFACE' ,
@HIST_CATCHCN 'CNNPP' , 'SURFACE' ,
@HIST_CATCHCN 'CNGPP' , 'SURFACE' ,
@HIST_CATCHCN 'CNSR' , 'SURFACE' ,
@HIST_CATCHCN 'CNNEE' , 'SURFACE' ,
@HIST_CATCHCN 'CNXSMR' , 'SURFACE' ,
@HIST_CATCHCN 'CNADD' , 'SURFACE' ,
@HIST_CATCHCN 'PARABS' , 'SURFACE' ,
@HIST_CATCHCN 'PARINC' , 'SURFACE' ,
@HIST_CATCHCN 'SCSAT' , 'SURFACE' ,
@HIST_CATCHCN 'SCUNS' , 'SURFACE' ,
@HIST_CATCHCN 'BTRANT' , 'SURFACE' , 'BTRAN' ,
@HIST_CATCHCN 'SIF' , 'SURFACE' ,
@HIST_CATCHCN 'CNLOSS' , 'SURFACE' , 'CLOSS' ,
@HIST_CATCHCN 'CNBURN' , 'SURFACE' , 'BURN' ,
@HIST_CATCHCN 'CNFSEL' , 'SURFACE' , 'FSEL' ,
@HIST_CATCHCN 'EVPICE' , 'SURFACE' ,
@HIST_CATCHCN 'EVPSNO' , 'SURFACE' ,
@HIST_CATCHCN 'EVPINT' , 'SURFACE' ,
@HIST_CATCHCN 'EVPSOI' , 'SURFACE' ,
@HIST_CATCHCN 'EVPVEG' , 'SURFACE' ,
@HIST_CATCHCN 'FRSAT' , 'SURFACE' ,
@HIST_CATCHCN 'FRUST' , 'SURFACE' ,
@HIST_CATCHCN 'FRWLT' , 'SURFACE' ,
@HIST_CATCHCN 'TPSAT' , 'SURFACE' ,
@HIST_CATCHCN 'TPUNST' , 'SURFACE' ,
@HIST_CATCHCN 'TPWLT' , 'SURFACE' ,
@HIST_CATCHCN 'TPSURF' , 'SURFACE' , 'TSURF' ,
@HIST_CATCHCN 'GHTSKIN' , 'SURFACE' ,
@HIST_CATCHCN 'WAT10CM' , 'SURFACE' ,
@HIST_CATCHCN 'WATSOI' , 'SURFACE' ,
@HIST_CATCHCN 'ICESOI' , 'SURFACE' ,
::

geosgcm_ocn.template: '%y4%m2%d2_%h2%n2z.nc4' ,
Expand Down
Loading

0 comments on commit 4eb79f7

Please sign in to comment.