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.

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

Upstream merge #2826

Closed
wants to merge 371 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
371 commits
Select commit Hold shift + click to select a range
c6d67f8
zeroing out x2a and a2x fields did not fix the bug
iulian787 Mar 23, 2024
6db12b3
init on atm data side with zeros;
iulian787 Mar 25, 2024
e070fa6
set moab fields in a loop
iulian787 Mar 25, 2024
e4110c0
data rof model and refactor set_moab_tag_from_av
iulian787 Apr 1, 2024
f3c042c
project i2a only if ice_c2_atm is true
iulian787 Apr 1, 2024
6ddfa09
fix error in data ocean
iulian787 Apr 1, 2024
32e0ceb
revert data rof changes on data atm branch
iulian787 Apr 1, 2024
3a271fb
misplaced ifdefs
iulian787 Apr 4, 2024
15ed401
initialize area, aream on coupler side for data atm
iulian787 Apr 4, 2024
483f57c
Fix offset for annual avg
mkstratos Apr 10, 2024
756debc
Merge branch 'bishtgautam/lnd/r025'(PR #6212)
peterdschwartz Apr 10, 2024
1327c10
Update mapping and domain files, add support for v3 ocn/ice mesh
jonbob Apr 10, 2024
acc601c
add moab paths for anlgce-ub22 machine
iulian787 Apr 10, 2024
3dbf165
add repository link in header of docs
mahf708 Apr 11, 2024
0b514b4
add search feature to header
mahf708 Apr 11, 2024
0b07fac
small fixes to site search additions
mahf708 Apr 11, 2024
33f6e69
minor edits in navigation
mahf708 Apr 11, 2024
3760c12
add code blocks edits, page actions
mahf708 Apr 11, 2024
f6fa04d
limit gh/ci to only eam, but not its docs
mahf708 Apr 11, 2024
d607969
add linter to lint new md files in prs
mahf708 Apr 11, 2024
064ac82
Merge remote-tracking branch 'scream/master' into jgfouca/scream_down…
jgfouca Apr 11, 2024
33643f0
run gh/ci F-case on elm as well
mahf708 Apr 11, 2024
549070a
ignore edits in mkdocs yml in cmp dir
mahf708 Apr 11, 2024
d424652
use negation instead of paths-ignore
mahf708 Apr 11, 2024
9fa0ce6
Turn on BP to NC on close for tests
jayeshkrishna Apr 11, 2024
06be92a
Merge branch 'iulian787/moab_paths_anlgce_ub22' (PR #6340)
rljacob Apr 11, 2024
9c48745
Reduce the number of new compset aliases to just one flavor of JRA
jonbob Apr 11, 2024
1274e0a
adjusted use_extrasnowlayers parameters based on Schneider et al., 2021
chloewhicker Mar 8, 2024
6762537
stylistic code mods
chloewhicker Mar 21, 2024
db67eb0
mod to use_extrasnowlayers tuning to be BFB
chloewhicker Mar 26, 2024
0bbb3b9
bug fixes to get B4B
chloewhicker Apr 1, 2024
75a1d26
Merge branch 'cwhicker/elm/use_extrasnowlayers-tuning' (PR #6298)
bishtgautam Apr 12, 2024
cf3e0c0
Merge branch 'maltrud/ocean/add-G-and-GP-and-ECO-compsets' (PR #6262)
jonbob Apr 12, 2024
bebb944
usage of export list from AV
iulian787 Apr 13, 2024
4934095
add a config to override line-length rule
mahf708 Apr 13, 2024
cc5f0bd
Updates the tests to only use 1-month of DATM data
Apr 13, 2024
208a1e8
Merge branch 'mahf708/docs/improve' (PR #6341)
rljacob Apr 14, 2024
d8d7d3f
Merge branch 'ndk/docn/remove-mct_mod-to-allow-nvidia-build' (PR #6333)
rljacob Apr 14, 2024
801afee
Update elmfates_interfaceMod.F90
rgknox Apr 15, 2024
7d55c63
add new tool to replace gen_domain in cime
whannah1 Apr 15, 2024
50d533e
run F gh/ci only if eam/elm/coupler mods
mahf708 Apr 15, 2024
558eb58
remove gh/ci edits to incorporate them in a separate PR
mahf708 Apr 15, 2024
63c9256
Merge branch 'mahf708/idp/ghci-specialize' (PR #6346)
rljacob Apr 15, 2024
cf7f4be
add missing subversion module to machine configs for quartz and ruby
AaronDonahue Apr 15, 2024
46f0bb3
add WCYCL2010NS compset
mahf708 Apr 16, 2024
d46acbf
add gh/ci-w tests
mahf708 Apr 16, 2024
3318f32
exclude paths properly via paths-ignore
mahf708 Apr 16, 2024
1d67d94
update tools/generate_domain_files_E3SM.py
whannah1 Apr 16, 2024
9a0ab28
Remove prescribed methane section from use_case files for SSPs
wlin7 Apr 16, 2024
e1e7058
Merge branch 'darincomeau/cpl/add-cryo-cpl-budgets' (PR #6229)
jonbob Apr 16, 2024
057cc51
Remove support for Greenland 20km ERP test
stephenprice Apr 16, 2024
ede39e5
move domain tool and add documentation
whannah1 Apr 16, 2024
3573055
rename yaml file
whannah1 Apr 16, 2024
2930e54
fix typo
whannah1 Apr 16, 2024
75fcd82
add text to docs
whannah1 Apr 16, 2024
f1f6eb2
Fixing logical on flds_polar driver namelist
darincomeau Apr 17, 2024
79d5978
Merge branch 'master' of github.com:E4SM-Project/E3SM into eclare/mpa…
eclare108213 Apr 17, 2024
de85394
Merge branch 'mahf708/docs/markdownlinter' (PR #6342)
rljacob Apr 17, 2024
1aa5d06
Updated formatting and CICE-QC instructions in development guide
eclare108213 Apr 17, 2024
03371d6
add land grid check to fates_cold test mod
glemieux Apr 16, 2024
829f56a
update docs
whannah1 Apr 17, 2024
450dee1
update docs
whannah1 Apr 17, 2024
d97f0b2
linter fixes
whannah1 Apr 17, 2024
bc65314
remove un-used eps variable
whannah1 Apr 17, 2024
e851050
refactor domain generation tool
whannah1 Apr 17, 2024
0bf7561
typo fix in docs
whannah1 Apr 17, 2024
be2735c
change yaml to yml
whannah1 Apr 17, 2024
fdc6927
switch bash to shell
whannah1 Apr 17, 2024
61dc8c0
Updates the libraries for GNU-GPU on Frontier
Apr 17, 2024
867cfa2
Add v3.NARRM resolution
tangq Apr 18, 2024
dcb96ae
Add references, updates to all other pages
eclare108213 Apr 18, 2024
bccf3ec
Attempt to fix some linter errors
eclare108213 Apr 18, 2024
689f7e5
More delinting
eclare108213 Apr 18, 2024
d710765
More delinting
eclare108213 Apr 18, 2024
508c537
More delinting
eclare108213 Apr 18, 2024
cf650e0
More delinting
eclare108213 Apr 18, 2024
033a76f
More delinting
eclare108213 Apr 18, 2024
baef174
Merge branch 'jgfouca/scream_downstream_04_11_24' into master (PR #6343)
jgfouca Apr 18, 2024
0a31621
Move MPAS Framework section, fix level-3 subsection headers
eclare108213 Apr 18, 2024
1a524b7
Remove mixed header styles for the linter
eclare108213 Apr 18, 2024
8ddcc91
Moves the ELM erosion test to E3SM integration testsuite
bishtgautam Apr 18, 2024
133dada
Add detail on Greenland 1-to-10km mesh being used.
stephenprice Apr 18, 2024
e86444e
Merge branch 'mkstratos/tests/add-mpaso-mvk-test' (PR #6207)
jonbob Apr 18, 2024
676a3ad
Merge branch 'darincomeau/cpl/fix-cryo-without-dib' (PR #6351)
jonbob Apr 18, 2024
b465c8c
Merge branch 'iulian787/export_list_fromAV' (PR #6344)
rljacob Apr 18, 2024
0e0df9e
Merge branch 'mahf708/idp/wcycl2010ns' (PR #6348)
rljacob Apr 18, 2024
e285087
Adds initial information in ELM user guide
bishtgautam Apr 18, 2024
39cdcc7
Update user guide re namelist and I/O
eclare108213 Apr 19, 2024
71db923
Turn off xpmem on Chrysalis
rljacob Apr 19, 2024
0e79126
Removes unsupported compsets
bishtgautam Apr 23, 2024
9fd5147
Adds new I-Compsets that are consistent with WCv3
bishtgautam Apr 23, 2024
a92b279
Merge branch 'xylar/mesh/add-icosxisc30e3r7' (PR $6312)
jonbob Apr 23, 2024
35b65ce
Merge branch 'bishtgautam/machines/frontier-gnugpu' (PR #6352)
grnydawn Apr 23, 2024
31703ab
misc bug fixes after PR changes
whannah1 Apr 23, 2024
531043f
cosmetic fix
whannah1 Apr 23, 2024
b2a5af7
remove "test" prefix for output domain files
whannah1 Apr 23, 2024
6f1a75d
Add comment explaining overrideTimeLevels
sbrus89 Apr 23, 2024
5e2deeb
Add FATES markdown page with a description and links to the various d…
glemieux Apr 23, 2024
7800ebf
update elm index doc with internal and external fates links
glemieux Apr 23, 2024
4debca5
for one fortran file, for pm-cpu, and for nvidia compiler only, disab…
ndkeen Apr 23, 2024
56f7f6c
Merge branch 'irenavankova/ocn/add-frazil-to-iceshelf' (PR #6300)
jonbob Apr 24, 2024
2ccabdf
uses Fortran linker to support compiler dependent intrinsic functions
grnydawn Apr 19, 2024
e56c1bc
add opts.lnd_mask_threshold for new gen domain tool
whannah1 Apr 24, 2024
b66d43e
revert lfrac threshold and adjust default fminval
whannah1 Apr 24, 2024
aca8a93
Point to correct, updated glsmask file for GIS 20km configurations.
stephenprice Apr 24, 2024
3f4b72c
Merge branch 'ykim/frontier/crayclang-update' (PR #6367)
grnydawn Apr 24, 2024
c2c3b2a
Merge remote-tracking branch 'rgknox/lnd/fates-twostream'(PR #6279)
peterdschwartz Apr 25, 2024
3306bae
Remove new landice devel tests from e3sm devel test suite.
stephenprice Apr 25, 2024
e82a4a2
Merge branch 'aarondonahue/lc_config/20240304' (PR #6281)
jasonb5 Apr 25, 2024
592df47
move semoab_mod file to homme shared folder
iulian787 Apr 25, 2024
62ba0f4
Update EKAT submodule, to get Kokkos 4.2
bartgol Dec 5, 2023
bec0414
HOMME: remove pointless lines in compose
bartgol Sep 27, 2023
980ef03
HOMME: remove volatile qualifier in custom reducer join method
bartgol Sep 27, 2023
dc5cb8f
HOMME: add missing iostream includes
bartgol Dec 5, 2023
d7ae678
HOMME: fix Kokkos-related compilation error
bartgol Dec 5, 2023
dabc215
HOMME: add missing cmakedefine to preqx config.h.cmake.in file
bartgol Dec 5, 2023
59ee13f
HOMME: add GllFvRemap cxx source files to preqx_kokkos sources
bartgol Dec 5, 2023
a863acb
HOMME: use new CMake syntax from EKAT to build kokkos
bartgol Dec 5, 2023
389cd9f
HOMME: do not set cxx standard. Kokkos will crap out anyways if c++17…
bartgol Jan 12, 2024
db1a5b0
HOMME: fix scope of HIPTraits from kokkos
bartgol Apr 23, 2024
3160ec7
EAMxx: add missing iostream include
bartgol Jan 16, 2024
74611c9
Disable OpenMP in Kokkos for frontier-scream-gpu machine
bartgol Apr 25, 2024
d8e3c71
Remove SMS.f09_g16_a.IGELM_MLI from e3sm_developer suite
jonbob Apr 25, 2024
4d2427b
Fix cut-and-paste error for TL319-gis1to10kmR2
jonbob Apr 25, 2024
ac74182
Merge branch 'bogensch/atm/SCMmods_for_v3' (PR #6254)
wlin7 Apr 26, 2024
6b38b86
Merge branch 'sbrus89/ocn/rk4_mem_leak' (PR #6334)
jonbob Apr 26, 2024
de9686e
Delete initializing tbot to posinf to allow info_dbug level 2 and above
wlin7 Apr 26, 2024
0a4237e
Add mkdocs extension to add tables in docs
crterai Mar 29, 2024
dc824f1
Add initial documentation to EAM users and tech guide
crterai Mar 29, 2024
5394343
Add bib file for references and HOMME description
crterai Mar 29, 2024
2d84331
Add information about the topography file
crterai Mar 29, 2024
2708cfd
Add documentation on OCEANFILMS and minor format fixes
crterai Mar 29, 2024
3986278
Update mam5.md
keziming Mar 29, 2024
1689a81
Fixes to EAM docs
crterai Apr 24, 2024
e6a2375
Updates to EAM docs to add citation and namelist parameters in user g…
crterai Apr 25, 2024
f8c1ba5
Small fix for formatting of EAM docs
crterai Apr 26, 2024
82c3169
Add MAM5 aerosol properties citation in EAM docs
crterai Apr 26, 2024
e2bcd99
Fix reference to ELM docs in EAM docs
crterai Apr 26, 2024
7b44cd8
Fix top-level description of MAM4 and MAM5 in EAM docs
crterai Apr 26, 2024
e029dce
fixing bib linking
mahf708 Apr 27, 2024
7aff0dc
fix misplaced search entry in plugins
mahf708 Apr 27, 2024
3701a6f
make reference lists into lists and fix typos
mahf708 Apr 27, 2024
efdf1e5
unify how we say developer/user/technical guide
mahf708 Apr 27, 2024
10e0130
fix linting errors
mahf708 Apr 27, 2024
fb304bd
Merge branch E3SM-Project/ndk/machinefiles/pm-cpu-nvidia-compiler-wor…
ndkeen Apr 29, 2024
432757a
skip gas_ac calculation when nstep=0
Apr 29, 2024
f0a9b5d
Combine MAM4 and MAM5 description in EAM docs
crterai Apr 29, 2024
b11528d
Fix environment variables in config machine file
mperego Apr 29, 2024
8e8872b
Fix code block formatting in EAM docs
crterai Apr 29, 2024
7b7f79a
Adding more nodes using Ubuntu 22.04 for machine anlgce-ub22
dqwu Apr 29, 2024
dca254a
Changing datestamp on JRA v1.5 runoff files to corrected versions
darincomeau Apr 29, 2024
9ee9e1d
Merge branch 'whannah/new-gen_domain-tool' (PR #6347)
singhbalwinder Apr 30, 2024
2c6147b
Merge branch 'wlin/atm/fix_info_debug_2p' (PR #6372)
singhbalwinder May 1, 2024
8c3fc18
Added/edited coupling information; added MPAS-Analysis scripts for QC…
eclare108213 May 1, 2024
e5753f3
Remove v3 refs from tech guide.
rljacob May 1, 2024
fced401
Add more eam docs to navigation
rljacob May 1, 2024
8d0a717
Clean up users guide
rljacob May 1, 2024
e1d902e
Additional re-org of eam user guide content
rljacob May 1, 2024
cfb3109
Merge branch 'iulian787/moab_data_atm' (PR #6325)
rljacob May 1, 2024
8141b60
Merge branch 'rljacob/chrysalis/no-xpmem' (PR #6359)
rljacob May 1, 2024
7f5de8b
Updating to SCORPIO v1.6.3
jayeshkrishna May 1, 2024
7de41c9
Merge branch 'stephenprice/glc/add-gis-support-020724' (PR #6226)
jonbob May 1, 2024
661e807
Merge branch 'tangq/scripts/add-northamericax4v1pg2_r025_IcoswISC30E3…
wlin7 May 1, 2024
3446d83
reorder if statement when nstep=0
May 1, 2024
3238b7b
Update the SSP testmod
wlin7 May 2, 2024
f535848
Update SSP use_case files with transient BGC land mode settings
wlin7 May 2, 2024
9311a73
Set SSP245 default STARTDATE
wlin7 May 2, 2024
27fde25
Add subgrid corrections and init mode test cases
sbrus89 Aug 24, 2022
4d2b27c
Update ocean.cmake
sbrus89 Mar 15, 2024
14739e2
Add review changes
sbrus89 Mar 26, 2024
590317b
Use layerThicknessCellWetDry for all W&D options
cbegeman Apr 3, 2024
dad98d0
Use same layerThickness prediction for all W&D options
cbegeman Apr 3, 2024
20fefac
Use same ssh gradient loop
cbegeman Apr 3, 2024
e2c190b
Minor clean-up
cbegeman Apr 5, 2024
a22321f
fixup
cbegeman Apr 5, 2024
538d9f8
Fix real variable declaration
sbrus89 Apr 8, 2024
fc88cc4
Add description to init_mode_subgrid namelist record
sbrus89 Apr 9, 2024
0644825
Update bld files to be consistent with mpaso Registry
jonbob May 1, 2024
61b43d3
Add MPAS-Ocean documentation
alicebarthel Apr 25, 2024
f9c0305
Merge branch 'alicebarthel/ocn/documentation' (PR #6371)
jonbob May 2, 2024
0a91718
Merge branch 'darincomeau/drof/jra1p5-runoff-fix' (PR #6379)
jonbob May 2, 2024
03cae64
Merge branch 'bishtgautam/lnd/erosion-test'(PR #6357)
peterdschwartz May 2, 2024
eb55983
Fix the citations format in EAM docs
crterai May 2, 2024
b0b532e
Link all namelist parameters to single source in EAM docs
crterai May 2, 2024
2e951c6
Update the citation format in EAM docs
crterai May 2, 2024
9decc8b
Add top level description of EAM in docs
crterai May 2, 2024
e89e440
Fix output labels in EAM docs
crterai May 2, 2024
b2306ef
don't bother linting reversed links
mahf708 May 2, 2024
21f2c59
Add top level E3SM guides
rljacob Apr 29, 2024
3b45719
Don't run coupled case CI for doc-only
rljacob Apr 29, 2024
849951a
Add content, change global nav
rljacob Apr 29, 2024
20dc41f
Update top level docs and add extension
rljacob May 2, 2024
f081275
Add to gitignore
rljacob May 2, 2024
21038fb
Add link to MPAS-Ocean docs
rljacob May 2, 2024
685af95
Add mkdocs.yml to mpas-ocean
rljacob May 2, 2024
d2d7251
change the grid to r05_r05 for lnd_rof_two_way test
donghuix May 2, 2024
15b7d32
Fix lint error
rljacob May 2, 2024
a592963
Change h0 tapes output frequency for the SSP testmod
wlin7 May 2, 2024
a61d1a0
remove eamxx from e3sm docs for now
mahf708 May 2, 2024
3ced192
Merge branch 'hsiangheleellnl/chem_bug_fix' (PR #6385)
wlin7 May 3, 2024
2db82b3
Merge branch 'crterai/eam/add_documentation' (PR #6314)
wlin7 May 3, 2024
cdc1f48
Restore config settings for idealized CO2 compsets
wlin7 May 3, 2024
0a9e954
Merge branch 'rljacob/docs/add-cime' (PR #6374)
rljacob May 3, 2024
5757225
Fix issues in namelist files
sbrus89 May 2, 2024
5f13df2
Add additional docs for running coupled e3sm
wlin7 May 3, 2024
8b9ed54
Revise description for the supported coupled compsets
wlin7 May 3, 2024
1ba9ab4
indicate that EAMxx is not yet supported explicitly
mahf708 May 3, 2024
41ff71d
Fix table format
wlin7 May 3, 2024
8c2893e
Remove extra blank line
wlin7 May 3, 2024
f62cbeb
Merge branch 'eclare/mpas-si/documentation' (PR #6356)
rljacob May 3, 2024
d3c7f86
Change to use actual pointer names for SSP aerosol forcing species
wlin7 May 3, 2024
ae1c470
Merge branch 'beharrop/atm/fix-floating-invalid-co2-diags' (PR #6275)
wlin7 May 3, 2024
788206b
Merge branch 'mahf708/eam/output-ccn-mair' (PR #6319)
wlin7 May 3, 2024
ba04c0a
Merge branch 'wlin/coupled/userguide' (PR #6392)
wlin7 May 3, 2024
86a901f
unload matlab
ndkeen May 3, 2024
c70608a
Add Paolo DISMF file for oQU240wLI
xylar Apr 4, 2024
962e20b
Add Merino DIB file for oQU240wLI
xylar Apr 4, 2024
08750d0
Add e3sm_cryo_developer test suite
xylar Apr 4, 2024
a411689
Removes TOC and fixes errors
bishtgautam May 4, 2024
2f10b6c
Merge branch 'wlin/update_v3ssp_compsets' (PR #6335)
wlin7 May 4, 2024
a77f1ee
MOSART guide initial draft
hydrotian Apr 29, 2024
33f9e31
Merge branch 'tizhou/mosart/documentation' (PR #6390)
bishtgautam May 5, 2024
d2e52ea
Add reference to offline compset using cpl output
thorntonpe May 5, 2024
250a729
Fixed a md whitespace error
thorntonpe May 5, 2024
a5273f0
Merge branch E3SM-Project/ndk/machinefiles/pm-unload-matlab-module (P…
ndkeen May 6, 2024
0a020e6
Removes a compset definition
bishtgautam May 7, 2024
3695744
Removes an incomplete section
bishtgautam May 7, 2024
e45c548
Merge branch 'bishtgautam/lnd/documentation' (PR #6358)
bishtgautam May 7, 2024
5aaaac0
Merge branch 'sbrus89/ocn/subgrid' (PR #6288)
jonbob May 7, 2024
7f057ef
Merge branch 'bishtgautam/lnd/i-compsets'(PR # 6362)
peterdschwartz May 7, 2024
24b1d23
Sets path to inputdata via shell_commands
bishtgautam May 7, 2024
046d478
for all machines using nersc_slurm settings, remove `exclusive` batch…
ndkeen May 7, 2024
31e0924
Merge branch '/mahf708/docs/hide-scream' (PR #6389)
rljacob May 7, 2024
382c586
Fixes the testmod name
bishtgautam May 8, 2024
5c6fdd5
added explicit k-loop for calculating vertDiffPassive
maltrud May 8, 2024
58f1c6e
Merge branch 'xylar/ice-ocn/add-e3sm-cryo-developer-suite' (PR #6338)
jonbob May 8, 2024
4fab3c8
Merge branch 'iulian787/move_semoab' (PR #6369)
rljacob May 8, 2024
cfa3463
Moves the new tests to a different testsuite
bishtgautam May 9, 2024
b25883b
Make bld files consistent with mpaso Registry using automated scripts
jonbob May 9, 2024
0621bb5
Merge branch 'dqwu/machinefiles/update-anlgce-ub22-nodes' (PR #6377)
jayeshkrishna May 10, 2024
a3b6d09
Merge branch 'maltrud/ocean/passive-tracer-vert-diffusion' (PR #6263)
jonbob May 10, 2024
cf32a25
Merge branch 'donghuix/lnd/fix-lnd-rof-two-way-test' (PR #6388)
peterdschwartz May 10, 2024
427b860
Merge remote-tracking branch 'liho/liho745/river/bug-fix-7792c63' (PR…
peterdschwartz May 10, 2024
58238ce
Merge branch E3SM-Project/ndk/machinefiles/pm-remove-exclusive-sbatch…
ndkeen May 11, 2024
52643ff
Updates the tests to not use use testmods
bishtgautam May 11, 2024
1eb1aa5
Merge branch 'cwhicker_m20240206_2_datm-era5' (PR #6234)
bishtgautam May 13, 2024
ed030dc
Merge branch 'bartgol/e3sm/kokkos-4.2' into master (PR #6101)
jgfouca May 15, 2024
dd32f0f
Merge branch 'jayeshkrishna/scorpio-v1.6.2' (PR #6329)
jayeshkrishna May 15, 2024
51c92b1
Merge remote-tracking branch 'upstream/master' into bartgol/upstream-…
bartgol May 15, 2024
7387fe2
EAMxx: fix usage of ekat's Units
bartgol May 15, 2024
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
Prev Previous commit
Next Next commit
remove "test" prefix for output domain files
whannah1 committed Apr 23, 2024
commit b2a5af7cf9b2dcc7d7ef29744fb0c10ed932aecd
6 changes: 3 additions & 3 deletions tools/generate_domain_files/generate_domain_files_E3SM.py
Original file line number Diff line number Diff line change
@@ -135,9 +135,9 @@ def main():
#-------------------------------------------------------------------------------
# specify output file names

domain_file_ocn_on_ocn = f'{opts.output_root}/test.domain.ocn.{opts.ocn_grid}.{cdate}.nc'
domain_file_lnd_on_atm = f'{opts.output_root}/test.domain.lnd.{opts.lnd_grid}_{opts.ocn_grid}.{cdate}.nc'
domain_file_ocn_on_atm = f'{opts.output_root}/test.domain.ocn.{opts.lnd_grid}_{opts.ocn_grid}.{cdate}.nc'
domain_file_ocn_on_ocn = f'{opts.output_root}/domain.ocn.{opts.ocn_grid}.{cdate}.nc'
domain_file_lnd_on_atm = f'{opts.output_root}/domain.lnd.{opts.lnd_grid}_{opts.ocn_grid}.{cdate}.nc'
domain_file_ocn_on_atm = f'{opts.output_root}/domain.ocn.{opts.lnd_grid}_{opts.ocn_grid}.{cdate}.nc'

# cosmetic clean up of file names
domain_file_ocn_on_ocn = domain_file_ocn_on_ocn.replace('//','/')