Skip to content

Commit 3bddaf4

Browse files
sdrabenhsdrabenh
authored
Merge pull request #747 from GEOS-ESM/develop
Sync develop into main
2 parents 34290f8 + a87a92c commit 3bddaf4

16 files changed

+134
-61
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
# Anchors in case we need to override the defaults from the orb
4-
#baselibs_version: &baselibs_version v7.27.0
4+
#baselibs_version: &baselibs_version v7.33.0
55
#bcs_version: &bcs_version v11.6.0
66

77
orbs:

‎.github/workflows/spack-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ jobs:
8181
- name: Set default compiler and target
8282
shell: spack-bash {0}
8383
run: |
84-
spack config add 'packages:all:compiler:[gcc@14.2.0]'
8584
spack config add 'packages:all:require:target=x86_64_v3'
8685
8786
- name: Create Spack environment
@@ -107,6 +106,7 @@ jobs:
107106
- name: Install
108107
shell: spack-bash {0}
109108
run: |
109+
spack clean -m
110110
spack -e spack-env install --add --no-check-signature --use-buildcache only \
111111
esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas
112112

‎.github/workflows/workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
2222
runs-on: ubuntu-24.04
2323
container:
24-
image: gmao/ubuntu24-geos-env:v7.32.0-intelmpi_2021.13-ifort_2021.13
24+
image: gmao/ubuntu24-geos-env:v7.33.0-intelmpi_2021.13-ifort_2021.13
2525
# Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
2626
# It seems like we might not need secrets on GitHub Actions which is good for forked
2727
# pull requests

‎CAP.rc.tmpl‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
2-
MAPLROOT_COMPNAME: GCM
3-
ROOT_NAME: GCM
1+
ROOT_NAME: GCM
42
ROOT_CF: AGCM.rc
53
HIST_CF: HISTORY.rc
64

‎HISTORY.AGCM.rc.tmpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,8 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
335335
'SWNDWTR' , 'SURFACE' , 'SWGNTWTR' ,
336336
'SWNDICE' , 'SURFACE' , 'SWGNTICE' ,
337337
'SNOWOCN' , 'SURFACE' , 'PRECSNOOCN' ,
338+
'ICEFOCN' , 'SURFACE' , 'PRECICEOCN' ,
339+
'SPTOTOCN' , 'SURFACE' , 'PRECSOLOCN' ,
338340
'RAINOCN' , 'SURFACE' ,
339341
'TAUXW;TAUYW' , 'SURFACE' , 'TAUXWTR;TAUYWTR',
340342
'TAUXI;TAUYI' , 'SURFACE' , 'TAUXICE;TAUYICE',

‎HISTORY.AOGCM-MOM5.rc.tmpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,8 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
343343
'SWNDWTR' , 'SURFACE' , 'SWGNTWTR' ,
344344
'SWNDICE' , 'SURFACE' , 'SWGNTICE' ,
345345
'SNOWOCN' , 'SURFACE' , 'PRECSNOOCN' ,
346+
'ICEFOCN' , 'SURFACE' , 'PRECICEOCN' ,
347+
'SPTOTOCN' , 'SURFACE' , 'PRECSOLOCN' ,
346348
'RAINOCN' , 'SURFACE' ,
347349
'TAUXW;TAUYW' , 'SURFACE' , 'TAUXWTR;TAUYWTR',
348350
'TAUXI;TAUYI' , 'SURFACE' , 'TAUXICE;TAUYICE',
@@ -1657,6 +1659,8 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
16571659
'RAINOCN' , 'OPENWATER',
16581660
'AO_RAIN' , 'OPENWATER',
16591661
'SNOWOCN' , 'OPENWATER',
1662+
'ICEFOCN' , 'OPENWATER',
1663+
'SPTOTOCN' , 'OPENWATER',
16601664
'AO_SNOW' , 'OPENWATER',
16611665
'FRACI' , 'SEAICETHERMO',
16621666
'FRZMLT' , 'SEAICETHERMO',

‎HISTORY.AOGCM.rc.tmpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,8 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
340340
'SWNDWTR' , 'SURFACE' , 'SWGNTWTR' ,
341341
'SWNDICE' , 'SURFACE' , 'SWGNTICE' ,
342342
'SNOWOCN' , 'SURFACE' , 'PRECSNOOCN' ,
343+
'ICEFOCN' , 'SURFACE' , 'PRECICEOCN' ,
344+
'SPTOTOCN' , 'SURFACE' , 'PRECSOLOCN' ,
343345
'RAINOCN' , 'SURFACE' ,
344346
'TAUXW;TAUYW' , 'SURFACE' , 'TAUXWTR;TAUYWTR',
345347
'TAUXI;TAUYI' , 'SURFACE' , 'TAUXICE;TAUYICE',
@@ -1582,6 +1584,8 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
15821584
'RAINOCN' , 'OPENWATER',
15831585
'AO_RAIN' , 'OPENWATER',
15841586
'SNOWOCN' , 'OPENWATER',
1587+
'ICEFOCN' , 'OPENWATER',
1588+
'SPTOTOCN' , 'OPENWATER',
15851589
'AO_SNOW' , 'OPENWATER',
15861590
'FRACI' , 'SEAICETHERMO',
15871591
'FRZMLT' , 'SEAICETHERMO',

‎HISTORY.AOGCM_MITgcm.rc.tmpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,8 @@ PC360x181-DC.GRIDNAME: PC360x181-DC
309309
'SWNDWTR' , 'SURFACE' , 'SWGNTWTR' ,
310310
'SWNDICE' , 'SURFACE' , 'SWGNTICE' ,
311311
'SNOWOCN' , 'SURFACE' , 'PRECSNOOCN' ,
312+
'ICEFOCN' , 'SURFACE' , 'PRECICEOCN' ,
313+
'SPTOTOCN' , 'SURFACE' , 'PRECSOLOCN' ,
312314
'RAINOCN' , 'SURFACE' ,
313315
'TAUXW;TAUYW' , 'SURFACE' , 'TAUXWTR;TAUYWTR',
314316
'TAUXI;TAUYI' , 'SURFACE' , 'TAUXICE;TAUYICE',
@@ -1665,6 +1667,8 @@ PC360x181-DC.GRIDNAME: PC360x181-DC
16651667
'RAINOCN' , 'OPENWATER',
16661668
'AO_RAIN' , 'OPENWATER',
16671669
'SNOWOCN' , 'OPENWATER',
1670+
'ICEFOCN' , 'OPENWATER',
1671+
'SPTOTOCN' , 'OPENWATER',
16681672
'AO_SNOW' , 'OPENWATER',
16691673
'FRACI' , 'SEAICETHERMO',
16701674
'FRZMLT' , 'SEAICETHERMO',

‎HISTORY.rc.tmpl‎

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
130130
'bkg.eta'
131131
'bkg.sfc'
132132
'cbkg.eta'
133+
'bkg.lfo_inst'
134+
'bkg.lfo_tavg'
133135
'vtx.mix'
134136
# 'vtx.prs'
135137
# 'prog.sfc+-'
@@ -139,9 +141,6 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
139141
# 'prog.eta+-'
140142
# 'traj.lcv'
141143
# 'ptrj.prs'
142-
# predictor forcing files for land da coupling
143-
# 'inst1_2d_lfo_Nx+-'
144-
# 'tavg1_2d_lfo_Nx+-'
145144
# Forecast Files
146145
# 'inst3_3d_asm_Np+-'
147146
# 'inst3_3d_asm_Nv+-'
@@ -1039,6 +1038,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
10391038
'SWNDWTR' , 'SURFACE' , 'SWGNTWTR' ,
10401039
'SWNDICE' , 'SURFACE' , 'SWGNTICE' ,
10411040
'SNOWOCN' , 'SURFACE' , 'PRECSNOOCN' ,
1041+
'ICEFOCN' , 'SURFACE' , 'PRECICEOCN' ,
1042+
'SPTOTOCN' , 'SURFACE' , 'PRECSOLOCN' ,
10421043
'RAINOCN' , 'SURFACE' ,
10431044
'TAUXW;TAUYW' , 'SURFACE' , 'TAUXWTR;TAUYWTR' ,
10441045
'TAUXI;TAUYI' , 'SURFACE' , 'TAUXICE;TAUYICE' ,
@@ -1097,6 +1098,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
10971098
'SWNDWTR' , 'SURFACE' , 'SWGNTWTR' ,
10981099
'SWNDICE' , 'SURFACE' , 'SWGNTICE' ,
10991100
'SNOWOCN' , 'SURFACE' , 'PRECSNOOCN' ,
1101+
'ICEFOCN' , 'SURFACE' , 'PRECICEOCN' ,
1102+
'SPTOTOCN' , 'SURFACE' , 'PRECSOLOCN' ,
11001103
'RAINOCN' , 'SURFACE' ,
11011104
'TAUXW;TAUYW' , 'SURFACE' , 'TAUXWTR;TAUYWTR' ,
11021105
'TAUXI;TAUYI' , 'SURFACE' , 'TAUXICE;TAUYICE' ,
@@ -1288,6 +1291,47 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
12881291
'GOCART::CO2' , 'GOCART' , 'CO2' ,
12891292
::
12901293

1294+
#######################################################################
1295+
# Ldas bkg forcing
1296+
#######################################################################
1297+
1298+
bkg.lfo_tavg.format: 'CFIO' ,
1299+
bkg.lfo_tavg.descr: '2d,1-Hourly,Time-Averaged,Single-Level,Land Surface Forcings' ,
1300+
bkg.lfo_tavg.template: '%y4%m2%d2_%h2%n2z.>>>NCSUFFIX<<<' ,
1301+
bkg.lfo_tavg.mode: 'time-averaged' ,
1302+
bkg.lfo_tavg.frequency: 010000 ,
1303+
bkg.lfo_tavg.duration: 010000 ,
1304+
bkg.lfo_tavg.ref_date: >>>IOBBKGD<<< ,
1305+
bkg.lfo_tavg.ref_time: >>>IOBBKGT<<< ,
1306+
bkg.lfo_tavg.end_date: >>>IOEBKGD<<< ,
1307+
bkg.lfo_tavg.end_time: >>>IOEBKGT<<< ,
1308+
bkg.lfo_tavg.fields: 'SLRSF' , 'SOLAR' , 'SWGDN' ,
1309+
'LWS' , 'IRRAD' , 'LWGAB' ,
1310+
'PCU' , 'SURFACE' , 'PRECCU' ,
1311+
'PLS' , 'SURFACE' , 'PRECLS' ,
1312+
'SNO' , 'SURFACE' , 'PRECSNO' ,
1313+
'DFPAR' , 'SOLAR' , 'PARDF' ,
1314+
'DRPAR' , 'SOLAR' , 'PARDR' ,
1315+
::
1316+
1317+
bkg.lfo_inst.format: 'CFIO' ,
1318+
bkg.lfo_inst.descr: '2d,1-Hourly,Instantaneous,Single-Level,Land Surface Forcings' ,
1319+
bkg.lfo_inst.template: '%y4%m2%d2_%h2%n2z.>>>NCSUFFIX<<<' ,
1320+
bkg.lfo_inst.mode: 'instantaneous' ,
1321+
bkg.lfo_inst.frequency: 010000 ,
1322+
bkg.lfo_inst.duration: 010000 ,
1323+
bkg.lfo_inst.ref_date: >>>IOBBKGD<<< ,
1324+
bkg.lfo_inst.ref_time: >>>IOBBKGT<<< ,
1325+
bkg.lfo_inst.end_date: >>>IOEBKGD<<< ,
1326+
bkg.lfo_inst.end_time: >>>IOEBKGT<<< ,
1327+
bkg.lfo_inst.fields: 'DZ' , 'DYN' , 'HLML' ,
1328+
'TA' , 'DYN' , 'TLML' ,
1329+
'QA' , 'DYN' , 'QLML' ,
1330+
'SPEED' , 'DYN' , 'SPEEDLML' ,
1331+
'PS' , 'DYN' ,
1332+
::
1333+
1334+
12911335
#######################################################################
12921336
# Aerosols/Constituents
12931337
#######################################################################
@@ -1981,49 +2025,6 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
19812025
'ZLE' , 'DYN' , 'hght' ,
19822026
::
19832027

1984-
#######################################################################
1985-
# predictor forcing files for land da coupling
1986-
#######################################################################
1987-
1988-
tavg1_2d_lfo_Nx+-.format: 'CFIO' ,
1989-
tavg1_2d_lfo_Nx+-.descr: '2d,1-Hourly,Time-Averaged,Single-Level,Land Surface Forcings' ,
1990-
# tavg1_2d_lfo_Nx+-.nbits: 10 ,
1991-
tavg1_2d_lfo_Nx+-.template: '%y4%m2%d2_%h2%n2z.>>>NCSUFFIX<<<' ,
1992-
tavg1_2d_lfo_Nx+-.mode: 'time-averaged' ,
1993-
tavg1_2d_lfo_Nx+-.frequency: 010000 ,
1994-
tavg1_2d_lfo_Nx+-.duration: 010000 ,
1995-
tavg1_2d_lfo_Nx+-.ref_date: >>>IOBBKGD<<< ,
1996-
tavg1_2d_lfo_Nx+-.ref_time: >>>IOBBKGT<<< ,
1997-
tavg1_2d_lfo_Nx+-.end_date: >>>IOEBKGD<<< ,
1998-
tavg1_2d_lfo_Nx+-.end_time: >>>IOEBKGT<<< ,
1999-
tavg1_2d_lfo_Nx+-.fields: 'SLRSF' , 'SOLAR' , 'SWGDN' ,
2000-
'SWLAND' , 'SURFACE' ,
2001-
'LWS' , 'IRRAD' , 'LWGAB' ,
2002-
'PCU' , 'SURFACE' , 'PRECRAINCU' ,
2003-
'PLS' , 'SURFACE' , 'PRECRAINLS' ,
2004-
'SNO' , 'SURFACE' , 'PRECSNO' ,
2005-
'DFPAR' , 'SOLAR' , 'PARDF' ,
2006-
'DRPAR' , 'SOLAR' , 'PARDR' ,
2007-
::
2008-
2009-
inst1_2d_lfo_Nx+-.format: 'CFIO' ,
2010-
inst1_2d_lfo_Nx+-.descr: '2d,1-Hourly,Instantaneous,Single-Level,Land Surface Forcings' ,
2011-
# inst1_2d_lfo_Nx+-.nbits: 10 ,
2012-
inst1_2d_lfo_Nx+-.template: '%y4%m2%d2_%h2%n2z.>>>NCSUFFIX<<<' ,
2013-
inst1_2d_lfo_Nx+-.mode: 'instantaneous' ,
2014-
inst1_2d_lfo_Nx+-.frequency: 010000 ,
2015-
inst1_2d_lfo_Nx+-.duration: 010000 ,
2016-
inst1_2d_lfo_Nx+-.ref_date: >>>IOBBKGD<<< ,
2017-
inst1_2d_lfo_Nx+-.ref_time: >>>IOBBKGT<<< ,
2018-
inst1_2d_lfo_Nx+-.end_date: >>>IOEBKGD<<< ,
2019-
inst1_2d_lfo_Nx+-.end_time: >>>IOEBKGT<<< ,
2020-
inst1_2d_lfo_Nx+-.fields: 'DZ' , 'DYN' , 'HLML' ,
2021-
'TA' , 'DYN' , 'TLML' ,
2022-
'QA' , 'DYN' , 'QLML' ,
2023-
'SPEED' , 'DYN' , 'SPEEDLML' ,
2024-
'PS' , 'DYN' ,
2025-
::
2026-
20272028
#######################################################################
20282029
# Forecast Files
20292030
#######################################################################

‎gcm_forecast.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ else
766766
endif
767767

768768
@SINGULARITY_BUILD @OCEAN_PRELOAD $RUN_CMD $TOTAL_PES $SINGULARITY_RUN $GEOSEXE $IOSERVER_OPTIONS $IOSERVER_EXTRA --logging_config 'logging.yaml'
769-
@NATIVE_BUILD @OCEAN_PRELOAD $RUN_CMD $TOTAL_PES $GEOSEXE $IOSERVER_OPTIONS $IOSERVER_EXTRA --logging_config 'logging.yaml'
769+
@NATIVE_BUILD @OCEAN_PRELOAD @SEVERAL_TRIES $RUN_CMD $TOTAL_PES $GEOSEXE $IOSERVER_OPTIONS $IOSERVER_EXTRA --logging_config 'logging.yaml'
770770

771771
if( $USE_SHMEM == 1 ) $GEOSBIN/RmShmKeys_sshmpi.csh >& /dev/null
772772

0 commit comments

Comments
 (0)