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

Jgfouca/scream downstream 04 11 24 #6343

Merged
merged 633 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
633 commits
Select commit Hold shift + click to select a range
569aa3f
setting something to a value actually needs an equal sign
mahf708 Feb 28, 2024
c683b81
aerosol_optics - remove coupled test.
odiazib Feb 28, 2024
e536515
aerosol_optics - add coupled test-physics_only
odiazib Feb 28, 2024
ba5fcf0
no const because we are setting string
mahf708 Feb 28, 2024
fac5cf4
aerosol_optics - update output file.
odiazib Feb 28, 2024
68b28e9
Scale optical depth before converting to emissivity
brhillman Feb 29, 2024
9673691
Add cldfrac_rad to always be consistent with cloud fraction radiation…
brhillman Feb 29, 2024
228af1d
Expose cosp::do_subcol_sampling as namelist option
brhillman Feb 29, 2024
4a98092
Default to no cosp subcolumns for ne256 and above
brhillman Feb 29, 2024
9d9249c
Add doc for cosp_subcolumns
brhillman Feb 29, 2024
ffbb9df
Add finidat default for ne256
brhillman Feb 29, 2024
c3df5b4
aerosol_optics - add coupled test.
odiazib Mar 1, 2024
fb06895
aerosol-optics - upate mam4xx to get fix in water uptake.
odiazib Mar 1, 2024
d9b1b78
aerosol_optics - fix label in uncouple test.
odiazib Mar 4, 2024
dfea194
Add doc string for do_subcol_sampling
brhillman Mar 4, 2024
7ecad1a
aerosol_optics - remove hard-coded variables.
odiazib Mar 4, 2024
85b0ee5
aerosol_optics - remove old comment.
odiazib Mar 4, 2024
e51c21b
Clean up condition and add documentation about unset fields
brhillman Mar 4, 2024
28da5a0
aerosol_optics - switch mam4xx to main branch.
odiazib Mar 4, 2024
8fceb48
Merge Pull Request #2730 from E3SM-Project/scream/brhillman/add-F20TR…
E3SM-Autotester Mar 4, 2024
02a7dfb
Merge Pull Request #2734 from E3SM-Project/scream/aarondonahue/lc_con…
E3SM-Autotester Mar 4, 2024
3c91e26
Delete cmake files for 2 machines we don't support on LC.
AaronDonahue Mar 5, 2024
a3f9f4a
Merge Pull Request #2735 from E3SM-Project/scream/mahf708/eamxx/diags…
E3SM-Autotester Mar 5, 2024
054d574
check-hashes-ers: Bring in to eamxx/scripts ecosystem
jgfouca Mar 5, 2024
9c03432
EAMxx: add possibility of querying whether a PIO file has an attribute
bartgol Mar 5, 2024
bbb6627
EAMxx: read timestamp's nsteps only if present on file
bartgol Mar 5, 2024
9997253
EAMxx: change default value for TimeStamp::m_num_steps to very neg value
bartgol Mar 5, 2024
56e30f3
EAMxx: read/write timestamp's nstep only if asked to do so
bartgol Mar 5, 2024
7928a27
EAMxx: better format logging in scorpio input/output
bartgol Mar 5, 2024
bf0d107
EAMxx: allow to set a logger in the time interp utility
bartgol Mar 5, 2024
dc779a4
Merge pull request #2741 from E3SM-Project/jgfouca/check_ers
jgfouca Mar 5, 2024
06d173d
changes for pm-gpu to avoid oversubscription
jgfouca Jan 25, 2024
5d34c97
Switch to salloc
jgfouca Mar 5, 2024
019fbcf
EAMxx: in buildnml, add map files needed for output to inputdata list
bartgol Mar 5, 2024
16a5ef8
test-all-scream: Move baseline build dir
jgfouca Mar 5, 2024
df094ba
Merge Pull Request #2742 from E3SM-Project/scream/bartgol/eamxx/nudgi…
E3SM-Autotester Mar 6, 2024
f81dd76
Merge Pull Request #2743 from E3SM-Project/scream/bartgol/eamxx/add-o…
E3SM-Autotester Mar 6, 2024
ce9646c
Switch to cldfrac_rad for cosp_standalone
brhillman Mar 6, 2024
9bdc586
Minor rethink of baseline situation
jgfouca Mar 6, 2024
add63f6
change function of get_vector_dim() and add get_vector_component_idx()
mjs271 Mar 6, 2024
dfe0ab1
Merge Pull Request #2737 from E3SM-Project/scream/brhillman/eamxx/fix…
E3SM-Autotester Mar 6, 2024
ea0ff66
correct a couple of typos
mjs271 Mar 6, 2024
c864822
EAMxx: fix next/last write ts handling
bartgol Mar 6, 2024
17f3fdf
EAMxx: fix bug in has_attribute scorpio util
bartgol Mar 7, 2024
2329705
Merge Pull Request #2746 from E3SM-Project/scream/mjs/eamxx/fix-#1996
E3SM-Autotester Mar 7, 2024
c58c3c2
Fix mistakes
jgfouca Mar 7, 2024
d0c4c81
Merge Pull Request #2744 from E3SM-Project/scream/bartgol/eamxx/times…
E3SM-Autotester Mar 7, 2024
24dc01b
Merge pull request #2745 from E3SM-Project/jgfouca/tas_baseline_build…
jgfouca Mar 7, 2024
8d11673
Removes concat_2_string call where one string was empty
singhbalwinder Mar 7, 2024
0718763
EAMxx: in time interp util, set logger in new reader when we shift file
bartgol Mar 7, 2024
b09b3b0
EAMxx: fix bug in IO when doing a restarted run without restarting hi…
bartgol Mar 8, 2024
e7941f4
Merge Pull Request #2748 from E3SM-Project/scream/bartgol/eamxx/fix-l…
E3SM-Autotester Mar 8, 2024
27a928a
EAMxx: add missing include in time stamp header
bartgol Mar 8, 2024
08ab314
Removes temporary cxx17 flag, fixes test mods for the CIME test and a…
singhbalwinder Mar 8, 2024
65e044b
Merge remote-tracking branch 'origin/master' into jgfouca/pm-tas-fixes
jgfouca Mar 8, 2024
610c6e5
Changes for running through CIME with IOP
tcclevenger Feb 16, 2024
a5c40f0
Add DP compset
tcclevenger Feb 28, 2024
1d8fed2
Add DP test
tcclevenger Feb 28, 2024
838f49c
Changes for restarts with IOP
tcclevenger Feb 29, 2024
dab974e
Rename to IOP and add doc to namelist defaults
tcclevenger Mar 8, 2024
171909d
Merge Pull Request #2739 from E3SM-Project/scream/tcclevenger/dp/crea…
E3SM-Autotester Mar 8, 2024
3b7382a
Do not manually set cuda arch. pm-gpu can do 4 GPUs per node
jgfouca Mar 11, 2024
839d1f7
EAMxx: move test types definitions for test-all-scream into separate …
bartgol Mar 11, 2024
a16e507
Fixes
jgfouca Mar 11, 2024
15a3017
Need cuda in env
jgfouca Mar 11, 2024
c51f179
EAMxx: use ctest with label to generate baselines
bartgol Mar 11, 2024
f3105c9
Tests take longer than 30m so cant use debug Q
jgfouca Mar 11, 2024
c2e21fb
EAMxx: import missing symbol in test-all-scream
bartgol Mar 11, 2024
05c3931
Use regular q
jgfouca Mar 11, 2024
c9ae8f8
Ask for more nodes
jgfouca Mar 11, 2024
88e1a84
EAMxx: fix name of TestProperty member
bartgol Mar 11, 2024
4cc3860
EAMxx: must gen the resource spec file also for baselines now
bartgol Mar 11, 2024
35bf04a
aerosol_optics - save mam_optics_rrtmgp test
odiazib Mar 12, 2024
f152d47
aerosol_optics - remove coupled tests: physics_only/shoc_cld_mam_opti…
odiazib Mar 12, 2024
5ccb6b0
aerosol_optics - update output.yaml
odiazib Mar 12, 2024
ed97f69
EAMxx: fix pylint error in test_all_scream.py
bartgol Mar 12, 2024
36cb55a
EAMxx: fix physics_saturation and rrtmgp baselines generation
bartgol Mar 12, 2024
1d551ea
Merge Pull Request #2749 from E3SM-Project/scream/bartgol/fix-io-bug-…
E3SM-Autotester Mar 12, 2024
fdd6ab0
Fix GPU probing
jgfouca Mar 12, 2024
1968006
Fix YAKL SetCudaFlags
jgfouca Mar 12, 2024
9abfab4
aerosol_optics - adding comment about volcanic aerosols.
odiazib Mar 12, 2024
3ef05a6
check-hashes-ers: Minor change so works with multi-case tests like PEM
jgfouca Mar 12, 2024
f1cfb87
EAMxx: enable rrtmgp baseline tests only if SCREAM_ENABLE_BASELINE_TE…
bartgol Mar 12, 2024
fd74584
EAMxx: must gen resource spec file also when gen baselines
bartgol Mar 13, 2024
c81c7d8
Change pm-gpu work dir
jgfouca Mar 13, 2024
30bdd8f
Merge pull request #2752 from E3SM-Project/jgfouca/check_hashes_pem
jgfouca Mar 13, 2024
df7a482
Merge pull request #2728 from E3SM-Project/jgfouca/upstream_merge_202…
jgfouca Mar 13, 2024
8176ff3
Bump actions/setup-python from 4.7.0 to 5.0.0
dependabot[bot] Mar 13, 2024
517cecb
EAMxx: remove redundant line in test-all-scream
bartgol Mar 13, 2024
609bccb
Merge pull request #2740 from E3SM-Project/aarondonahue/20240304/remo…
AaronDonahue Mar 13, 2024
685096c
Adjust pm-gpu workdir
jgfouca Mar 13, 2024
642df15
Do not run AT on dependabot PRs
bartgol Mar 13, 2024
3211c23
EAMxx: add a script to generate/edit output stream yaml files
bartgol Feb 22, 2024
3d2ba5c
EAMxx: add doctest to edit-output-stream scripts
bartgol Feb 22, 2024
b92bfc3
EAMxx: allow to set freq/freq-units via CIME vars in edit-output-stream
bartgol Feb 23, 2024
3927efd
EAMxx: fix corner case usage in atm_manip.py
bartgol Feb 23, 2024
c11f771
EAMxx: add more support to edit-output-stream script
bartgol Feb 23, 2024
667caa5
EAMxx: use no output stream by default
bartgol Feb 23, 2024
4a3f159
EAMxx: add hierarchy of testmods for different model output
bartgol Feb 23, 2024
839b1a4
EAMxx: remove outdate README file for scream yaml files
bartgol Feb 23, 2024
467a0eb
Set different output presets for scream cime tests
bartgol Feb 23, 2024
61f43aa
EAMxx: avoid confusion in output testmods related to different env va…
bartgol Feb 26, 2024
b460a2b
EAMxx: change the dyn testmod to phys_dyn, to have 2 grids in same st…
bartgol Feb 26, 2024
c16d93a
EAMxx: fix upper/lower case issues in edit-output-stream script
bartgol Feb 28, 2024
f355aa2
EAMxx: fix testmods for output
bartgol Feb 28, 2024
2ee80f2
EAMxx: change cime vars accepted by edit-output-stream
bartgol Mar 6, 2024
572f50d
EAMxx: add option in I/O to skip t=t0 output (for avg=INSTANT)
bartgol Mar 6, 2024
c068a42
EAMxx: allow INSTANT output in ERS/ERP tests, but without t0 output
bartgol Mar 6, 2024
3ab9a0f
EAMxx: use a better vremap map file for output testmods
bartgol Mar 6, 2024
9a0c6f8
EAMxx: fix name of yaml file entry in buildnml
bartgol Mar 6, 2024
8a74b6e
Make custom work dir if it's not there
jgfouca Mar 13, 2024
f453500
Fix whitespace
jgfouca Mar 13, 2024
6521987
Add parents to work dir
jgfouca Mar 13, 2024
3343d21
Run e3sm gh action only if repo name is e3sm
bartgol Mar 13, 2024
133e746
Merge pull request #2757 from E3SM-Project/jgfouca/pm-tas-fixes
jgfouca Mar 13, 2024
4f13c83
Merge pull request #2727 from E3SM-Project/bartgol/eamxx/output-strea…
bartgol Mar 13, 2024
ea7a76a
Merge Pull Request #2751 from E3SM-Project/scream/bartgol/eamxx/tas/c…
E3SM-Autotester Mar 13, 2024
f46a929
Merge Pull Request #2755 from E3SM-Project/scream/dependabot/github_a…
E3SM-Autotester Mar 13, 2024
2ae6d5c
Merge Pull Request #2756 from E3SM-Project/scream/bartgol/dependabot-…
E3SM-Autotester Mar 14, 2024
c1e08e7
EAMxx: add utility to create a backup commit from a dirty repo
bartgol Mar 11, 2024
2e7b950
EAMxx: some mods to test-all-scream
bartgol Mar 11, 2024
7b310bd
EAMxx: propagate changes in test-all-scream to scripts-tests
bartgol Mar 11, 2024
3778e43
EAMxx: removed -f/--fast-fail option from test-all-scream
bartgol Mar 12, 2024
5de66a6
EAMxx: do not build Ekat if SCREAM_FAKE_ONLY is defined in the env
bartgol Mar 13, 2024
3a05d8e
EAMxx: honor env var SCREAM_FAKE_AUTO in test-all-scream
bartgol Mar 13, 2024
a5e6f59
Merge Pull Request #2758 from E3SM-Project/scream/bartgol/gh-actions-…
E3SM-Autotester Mar 14, 2024
213b590
EAMxx: in TestAllScream init, do git repo ops before baselines ops
bartgol Mar 14, 2024
562f4df
EAMxx: bug fix in test-all-scream
bartgol Mar 14, 2024
ff99a46
EAMxx: fix cime-nml-tests
bartgol Mar 15, 2024
63c0447
EAMxx: handle OpenMP and MPI manually for resource_spread target
bartgol Mar 15, 2024
87a6714
EAMxx: remove redundant spread tests in scripts-tests, but also check…
bartgol Mar 15, 2024
d63c096
EAMxx: organize main CMakeLists.txt in coherent sections
bartgol Mar 7, 2024
6f9d7fc
EAMxx: renamed a couple of CMake vars for baselines
bartgol Mar 7, 2024
d8365a4
EAMxx: add baseline testing for AD tests
bartgol Mar 8, 2024
871180e
EAMxx: create baseline dirs only if generate baselines is called
bartgol Mar 8, 2024
9d9329a
EAMxx: add baseline_cmp label, and renamed label baseline->baseline_gen
bartgol Mar 8, 2024
b70c0c0
EAMxx: add cmake function util to perform the baseline_cmp test
bartgol Mar 8, 2024
8bd69d1
EAMxx: create baseline_list file, so that scripts tests find it
bartgol Mar 8, 2024
ef2ca0b
EAMxx: add rrtmgp standalone to baselines tests
bartgol Mar 15, 2024
32a9820
Merge pull request #2753 from E3SM-Project/bartgol/eamxx/some-changes…
bartgol Mar 15, 2024
a0d0618
EAMxx: fix typo
bartgol Mar 15, 2024
b04af6b
EAMxx: add possibility of auto-flushing the atm logger
bartgol Mar 15, 2024
d5c1ea6
Merge pull request #2750 from E3SM-Project/bartgol/eamxx/standalone-t…
bartgol Mar 15, 2024
0459aca
Merge Pull Request #2760 from E3SM-Project/scream/bartgol/eamxx/logge…
E3SM-Autotester Mar 15, 2024
a1941df
EAMxx: run rrtmgp standalone baseline tests only if appropriate
bartgol Mar 18, 2024
9686fcc
buildnml: Write dbg XML when things fail
jgfouca Mar 18, 2024
31dce43
fix_fill_ends_computation
tcclevenger Mar 18, 2024
e871a4e
convert cell length to m
tcclevenger Mar 18, 2024
48f7154
Merge Pull Request #2764 from E3SM-Project/scream/jgfouca/add_dbg_xml
E3SM-Autotester Mar 20, 2024
59ea9a3
Merge Pull Request #2763 from E3SM-Project/scream/bartgol/eamxx/rrtmg…
E3SM-Autotester Mar 20, 2024
09444e0
add DP test to CIME AT list
tcclevenger Mar 20, 2024
baa9547
EAMxx: renamed AD tests folders to avoid confusion
bartgol Mar 18, 2024
79c5bdc
Limit ntasks for DP CIME test
tcclevenger Mar 20, 2024
75c002c
No need for testmod, just hardcode 16 tasks
tcclevenger Mar 20, 2024
a64ed8f
Merge Pull Request #2765 from E3SM-Project/scream/bartgol/eamxx/renam…
E3SM-Autotester Mar 21, 2024
49591fd
Merge pull request #2762 from E3SM-Project/tcclevenger/dp/fix_dx_and_…
tcclevenger Mar 21, 2024
1e432c8
test-all-scream: Fix help. b can be used for baseline-dir now
jgfouca Mar 21, 2024
2e09600
Remove dry-run comparisons from scripts-tests
jgfouca Mar 21, 2024
550a203
Remove dry-run support from TAS
jgfouca Mar 21, 2024
23c7c32
Fix pylint issues
jgfouca Mar 21, 2024
4de5fed
More dry run removal
jgfouca Mar 21, 2024
815e4cd
Merge Pull Request #2767 from E3SM-Project/scream/jgfouca/minor_tas
E3SM-Autotester Mar 21, 2024
4a79521
EAMxx: look for pnetcdf as well in test-all-scream
bartgol Mar 21, 2024
b75ebea
EAMxx: fix handling of repo cleanup in test-all-scream
bartgol Mar 21, 2024
66b6f25
Merge Pull Request #2768 from E3SM-Project/scream/bartgol/eamxx/use-p…
E3SM-Autotester Mar 21, 2024
644b4c4
Speed up `get_rain_dsd2` calculations.
quantheory Nov 6, 2023
5df69bd
Merge with the latest master, resolves conflict and redo non-cime sta…
singhbalwinder Mar 22, 2024
08260eb
Adds p_int to replace repeated p_del and addresses other review comments
singhbalwinder Mar 22, 2024
639b5d5
Adds GATOR memory pool for mappy to avoid running out of memory
singhbalwinder Mar 22, 2024
e55c507
test-all-scream: Fix force_baseline_regen
jgfouca Mar 22, 2024
ac58175
test-all-scream: Make baseline copying more robust
jgfouca Mar 22, 2024
bb1622a
safe_copy only works with string paths, not Paths
jgfouca Mar 22, 2024
dfdb126
Fixes file names for baselines for the standalone tests
singhbalwinder Mar 22, 2024
09e4afb
Merge Pull Request #2769 from E3SM-Project/scream/jgfouca/tas_minor_b…
E3SM-Autotester Mar 22, 2024
931d88c
test-all-scream: allow git symmetric diff to fail
jgfouca Mar 25, 2024
80f7e32
Merge pull request #2771 from E3SM-Project/jgfouca/tas_allow_sym_diff…
jgfouca Mar 25, 2024
bed9905
EAMxx: fix small bug in flushing file in scorpio interface
bartgol Mar 25, 2024
67ae61b
EAMxx: nano-opt in output manager
bartgol Mar 25, 2024
53561df
Merge Pull Request #2772 from E3SM-Project/scream/bartgol/eamxx/fix-f…
E3SM-Autotester Mar 25, 2024
6feb48d
Merge pull request #2592 from E3SM-Project/quantheory/rain-dsd-speedup
bartgol Mar 27, 2024
e52ec71
scripts-tests: Fix on weaver
jgfouca Mar 27, 2024
cac5c2a
update ekat
tcclevenger Mar 27, 2024
b979ac9
Merge Pull Request #2775 from E3SM-Project/scream/jgfouca/fix_weaver_…
E3SM-Autotester Mar 27, 2024
b50e669
Merge Pull Request #2774 from E3SM-Project/scream/tcclevenger/ekat_up…
E3SM-Autotester Mar 28, 2024
51aeed0
aerosol_optics -better names for layouts.
odiazib Mar 28, 2024
54930e0
aerosol_optics - updating comments.
odiazib Mar 28, 2024
43d73cb
aerosol_optics - fixing computation for aero_g_sw = aero_tau_g_sw/ ta…
odiazib Mar 28, 2024
4dd22cd
aerosol_optics - changing field name: aero_g_sw_mam4 -> aero_tau_g_sw…
odiazib Mar 28, 2024
47635b0
aerosol_optics - remove a few comments.
odiazib Mar 28, 2024
85704b7
aerosol_optics - fix band ordering of mam4xx's swband outputs.
odiazib Mar 28, 2024
4c7bec1
aerosol_optics - adding mam4 to field names of variables where we did
odiazib Mar 28, 2024
15c3ef6
aerosol_optics - remove old comment.
odiazib Mar 28, 2024
e9116d7
aerosol_optics - remove #if.
odiazib Mar 29, 2024
decbd3c
aerosol_optics -renaming field tags with more descriptive/specific na…
odiazib Mar 29, 2024
69e552a
aerosol_optics - removing checksi; @bartgol: ParameterList will alre…
odiazib Mar 29, 2024
d2aa9aa
aerosol_optics - Luca's recomendation to improve code.
odiazib Mar 29, 2024
68e26b8
aerosol_optics - using map to remove multiple lines of code; based on
odiazib Mar 29, 2024
31147e2
aerosol_optics - rrtmg_to_rrtmgp_swbands is a class member and a view.
odiazib Mar 29, 2024
1ad2137
aerosol_optics fixing bug.
odiazib Mar 29, 2024
08eeed4
aerosol_optics - fix ordering.
odiazib Mar 29, 2024
6c24848
aerosol_optics - using Kokkos::parallel_for to reshape tables.
odiazib Mar 29, 2024
a160267
Changes _int to _ilev in a layout variable name
singhbalwinder Mar 29, 2024
6bb90ae
A minor comment fix
singhbalwinder Mar 29, 2024
7a2adbb
Uses xmlchange append in the CIME test mod
singhbalwinder Mar 30, 2024
b046799
Bump actions/setup-python from 5.0.0 to 5.1.0
dependabot[bot] Apr 1, 2024
546a890
Merge pull request #2777 from E3SM-Project/dependabot/github_actions/…
bartgol Apr 1, 2024
9e42d37
Update EKAT submodule
jgfouca Apr 2, 2024
a9b7c3b
Update CIME submodule
jgfouca Apr 2, 2024
15417c0
Merge pull request #2780 from E3SM-Project/jgfouca/update_cime_subm
jgfouca Apr 2, 2024
89de983
aerosol_optics - replace Kokkos_ENABLE_CUDA with EAMXX_ENABLE_GPU.
odiazib Apr 2, 2024
6b87516
Merge Pull Request #2779 from E3SM-Project/scream/jgfouca/update_ekat…
E3SM-Autotester Apr 3, 2024
8054a09
Fix rrtmgp valgrind tests
jgfouca Apr 3, 2024
4918295
Fix standalone eamxx build on pm-gpu
jgfouca Apr 3, 2024
1439884
Merge Pull Request #2781 from E3SM-Project/scream/jgfouca/fix_valgrin…
E3SM-Autotester Apr 3, 2024
d66d320
aerosol_optics - remove printf.
odiazib Apr 4, 2024
a983c6e
aerosol_optics - improve comment.
odiazib Apr 4, 2024
87eeff2
aerosol_optics - delete comment.
odiazib Apr 4, 2024
8a54cef
aerosol_optics - delete code.
odiazib Apr 4, 2024
69aa173
aerosol_optics - cleaning up comments.
odiazib Apr 4, 2024
cf8b232
aerosol_optics - rename layout.
odiazib Apr 4, 2024
b72e4e7
aerosol_optics - update comment.
odiazib Apr 4, 2024
ef85da6
aerosol_optics - comment.
odiazib Apr 4, 2024
d9da092
aerosol_optics - update comments.
odiazib Apr 4, 2024
980979c
aerosol_optics - update comments.
odiazib Apr 4, 2024
fa3b6d2
aerosol_optics - from Updated to Required.
odiazib Apr 4, 2024
8ae9ed8
aerosol_optics - removed duplicate variable.
odiazib Apr 4, 2024
4c5e6af
Merge remote-tracking branch 'upstream/master' into jgfouca/upstream_…
jgfouca Apr 4, 2024
07a95c7
Switch mappy over to new toolchain
jgfouca Apr 4, 2024
f8f601e
aerosol_optics - remove aero from variable name.
odiazib Apr 5, 2024
d6418f5
aerosol_optics - remove aero from aero_tau_ssa_sw.
odiazib Apr 5, 2024
f2ac60f
aerosol_optics - remove aero from aero_tau_sw.
odiazib Apr 5, 2024
b9846ae
aerosol_optics - rename: aero_tau_forward -> tau_f_lw .
odiazib Apr 5, 2024
60e17f2
aerosol_optics - fix typo.
odiazib Apr 5, 2024
b8d083f
aerosol_optics - remove temporal variables from field manager.
odiazib Apr 5, 2024
55c7b69
aerosol_optics - remove old comment.
odiazib Apr 5, 2024
a6c73f4
Merge pull request #2782 from E3SM-Project/jgfouca/fix_pm_gpu_sa_build
jgfouca Apr 5, 2024
9750814
Add fallow-arg-mismatch to mappy
jgfouca Apr 5, 2024
0002e01
Merge branch 'master' into oscar/aerosol_optics_rebase
odiazib Apr 5, 2024
505b196
aerosol_optics - remove aero_tau_forward from field manager.
odiazib Apr 8, 2024
85a23d8
aerosol_optics - remove old comment.
odiazib Apr 8, 2024
de576cb
aerosol_optics - fixing run time error; we need to use
odiazib Apr 8, 2024
259d631
aerosol_optics - remove code.
odiazib Apr 8, 2024
558dce9
Merge branch 'master' into oscar/aerosol_optics_rebase
odiazib Apr 8, 2024
8cd7fea
add doc for namelist variables for MAM4 optics input files
mingxuanwupnnl Apr 10, 2024
3af8248
Merge remote-tracking branch 'upstream/master' into jgfouca/upstream_…
jgfouca Apr 10, 2024
611e954
aerosol_optics - fixing name of variable: from tau_g_sw to tau_ssa_g_sw.
odiazib Apr 10, 2024
10dad56
Merge pull request #2718 from eagles-project/oscar/aerosol_optics_rebase
AaronDonahue Apr 10, 2024
910d90f
Merge remote-tracking branch 'origin/master' into jgfouca/upstream_me…
jgfouca Apr 11, 2024
d60caf6
Merge pull request #2784 from E3SM-Project/jgfouca/upstream_merge_202…
jgfouca Apr 11, 2024
064ac82
Merge remote-tracking branch 'scream/master' into jgfouca/scream_down…
jgfouca Apr 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ updates:
reviewers:
- "mahf708"
- "bartgol"
labels:
- "AT: Integrate Without Testing"
1 change: 1 addition & 0 deletions .github/workflows/e3sm-gh-ci-cime-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
jobs:

ci:
if: ${{ github.event.repository.name == 'e3sm' }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e3sm-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:

jobs:
Build-and-Deploy-docs:
if: ${{ github.event.repository.name != 'scream' }}
if: ${{ github.event.repository.name == 'e3sm' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
62 changes: 62 additions & 0 deletions .github/workflows/eamxx_default_files.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: inputdata
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does this do?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it checks that certain inputs are downloaded.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, that's right. It checkes that eamxx default files in the xml are actually present on the server, and if they are not present, it will open an issue. It runs periodically behind the scenes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can disable it for now if this is an issue (or have it run only on the scream side downstream).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be harmless for E3SM, right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is harmless. In fact, it should be a good addition (early notification for server/user errors). It won't try to figure out what's wrong with E3SM inputfiles at all, but we can extend that later if desired.


on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
schedule:
- cron: '00 00 * * *'
workflow_dispatch:

jobs:
scream-defaults:
runs-on: ubuntu-latest
outputs:
event_name: ${{ github.event_name }}
steps:
- name: Check out the repository
uses: actions/checkout@v4
with:
show-progress: false
submodules: false
- name: Set up Python 3.11
uses: actions/[email protected]
with:
python-version: "3.11"
- name: Run unit tests
working-directory: components/eamxx/cime_config/
run: |
python -m unittest tests/eamxx_default_files.py -v

notify-scream-defaults:
needs: scream-defaults
if: ${{ failure() && needs.scream-defaults.outputs.event_name != 'pull_request' }}
runs-on: ubuntu-latest
steps:
- name: Create issue
run: |
previous_issue_number=$(gh issue list \
--label "$LABELS" \
--json number \
--jq '.[0].number')
if [[ -n $previous_issue_number ]]; then
gh issue comment "$previous_issue_number" \
--body "$BODY"
else
gh issue create \
--title "$TITLE" \
--assignee "$ASSIGNEES" \
--label "$LABELS" \
--body "$BODY"
fi
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
TITLE: Inputdata server file missing
ASSIGNEES: mahf708,bartgol
LABELS: bug,input file,notify-file-gh-action
BODY: |
Workflow failed! There's likely a missing file specified in the configs! For more information, please see:
- Workflow URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} (number ${{ github.run_number }}, attempt ${{ github.run_attempt }})
- Workflow SHA: ${{ github.sha }}
5 changes: 5 additions & 0 deletions cime_config/config_grids.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4480,6 +4480,11 @@
<map name="ROF2LND_FMAPNAME">lnd/clm2/mappingdata/maps/ne240np4/map_0.1x0.1_nomask_to_ne240np4_nomask_aave_da_c120706.nc</map>
</gridmap>

<gridmap lnd_grid="ne256np4.pg2" rof_grid="r0125">
<map name="LND2ROF_FMAPNAME">cpl/gridmaps/ne256pg2/map_ne256pg2_to_r0125_mono.200212.nc</map>
<map name="ROF2LND_FMAPNAME">cpl/gridmaps/ne256pg2/map_r0125_to_ne256pg2_mono.200212.nc</map>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"mono" is no longer a valid key in a map name.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brhillman , can you chime in here? Looks like you added this on the eamxx side with this commit:

commit b23a4b48fe0fe967a3f3442a4fb52a0ecd9267d5
Author: Benjamin Hillman <[email protected]>
Date:   Fri Feb 2 17:10:48 2024 -0500

    Add grid maps for ne256 with MOSART r0125

diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
index 614eaf0..f877867 100755
--- a/cime_config/config_grids.xml
+++ b/cime_config/config_grids.xml
@@ -4385,6 +4385,11 @@
       <map name="ROF2LND_FMAPNAME">lnd/clm2/mappingdata/maps/ne240np4/map_0.1x0.1_nomask_to_ne240np4_nomask_aave_da_c120706.nc</map>
     </gridmap>
 
+    <gridmap lnd_grid="ne256np4.pg2" rof_grid="r0125">
+      <map name="LND2ROF_FMAPNAME">cpl/gridmaps/ne256pg2/map_ne256pg2_to_r0125_mono.200212.nc</map>
+      <map name="ROF2LND_FMAPNAME">cpl/gridmaps/ne256pg2/map_r0125_to_ne256pg2_mono.200212.nc</map>
+    </gridmap>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rljacob what are we calling the conservative monotonic tempest remap algorithm now?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brhillman , @rljacob , so should this be changed to:
map_ne256pg2_to_r0125_traave.200212.nc
map_r0125_to_ne256pg2_traave.200212.nc

</gridmap>

<gridmap lnd_grid="ne1024np4.pg2" rof_grid="r0125">
<map name="LND2ROF_FMAPNAME">cpl/gridmaps/ne1024pg2/map_ne1024pg2_to_r0125_mono.200212.nc</map>
<map name="ROF2LND_FMAPNAME">cpl/gridmaps/ne1024pg2/map_r0125_to_ne1024pg2_mono.200212.nc</map>
Expand Down
32 changes: 16 additions & 16 deletions cime_config/machines/config_machines.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2965,10 +2965,10 @@
<MPILIBS>spectrum-mpi</MPILIBS>
<PROJECT>cbronze</PROJECT>
<CIME_OUTPUT_ROOT>/usr/workspace/$USER/e3sm_scratch</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/usr/gdata/climdat/ccsm3data/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/usr/gdata/climdat/ccsm3data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DIN_LOC_ROOT>/usr/gdata/e3sm/ccsm3data/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/usr/gdata/e3sm/ccsm3data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/usr/workspace/$USER/archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>/usr/gdata/climdat/baselines/$COMPILER</BASELINE_ROOT>
<BASELINE_ROOT>/usr/gdata/e3sm/baselines/$COMPILER</BASELINE_ROOT>
<GMAKE_J>16</GMAKE_J>
<BATCH_SYSTEM>lsf</BATCH_SYSTEM>
<SUPPORTED_BY>donahue5 -at- llnl.gov</SUPPORTED_BY>
Expand Down Expand Up @@ -3022,9 +3022,9 @@
</environment_variables>
<environment_variables compiler="gnugpu">
<env name="LLNL_USE_OMPI_VARS">y</env>
<env name="PATH">/usr/gdata/climdat/netcdf/bin:$ENV{PATH}</env>
<env name="LD_LIBRARY_PATH">/usr/gdata/climdat/netcdf/lib:$ENV{LD_LIBRARY_PATH}</env>
<env name="NETCDF_PATH">/usr/gdata/climdat/netcdf</env>
<env name="PATH">/usr/gdata/e3sm/netcdf/bin:$ENV{PATH}</env>
<env name="LD_LIBRARY_PATH">/usr/gdata/e3sm/netcdf/lib:$ENV{LD_LIBRARY_PATH}</env>
<env name="NETCDF_PATH">/usr/gdata/e3sm/netcdf</env>
<env name="RS_PER_NODE">2</env>
<env name="CPU_PER_RS">20</env>
<env name="GPU_PER_RS">2</env>
Expand All @@ -3041,11 +3041,11 @@
<MPILIBS>mpich</MPILIBS>
<PROJECT>cbronze</PROJECT>
<CIME_OUTPUT_ROOT>/p/lustre2/$USER/e3sm_scratch/ruby</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/usr/gdata/climdat/ccsm3data/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/usr/gdata/climdat/ccsm3data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DIN_LOC_ROOT>/usr/gdata/e3sm/ccsm3data/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/usr/gdata/e3sm/ccsm3data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/p/lustre2/$USER/archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>/p/lustre2/$USER/ccsm_baselines/$COMPILER</BASELINE_ROOT>
<CCSM_CPRNC>/usr/gdata/climdat/tools/cprnc</CCSM_CPRNC>
<CCSM_CPRNC>/usr/gdata/e3sm/tools/cprnc</CCSM_CPRNC>
<GMAKE_J>8</GMAKE_J>
<BATCH_SYSTEM>lc_slurm</BATCH_SYSTEM>
<SUPPORTED_BY>donahue5 -at- llnl.gov</SUPPORTED_BY>
Expand Down Expand Up @@ -3073,7 +3073,7 @@
<command name="load">intel-classic/2021.6.0-magic</command>
<command name="load">mvapich2/2.3.7</command>
<command name="load">cmake/3.19.2</command>
<command name="use --append">/usr/gdata/climdat/install/quartz/modulefiles</command>
<command name="use --append">/usr/gdata/e3sm/install/quartz/modulefiles</command>
<command name="load">hdf5/1.12.2</command>
<command name="load">netcdf-c/4.9.0</command>
<command name="load">netcdf-fortran/4.6.0</command>
Expand All @@ -3084,7 +3084,7 @@
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
<environment_variables compiler="intel">
<env name="NETCDF_PATH">/usr/gdata/climdat/install/quartz/netcdf-fortran/</env>
<env name="NETCDF_PATH">/usr/gdata/e3sm/install/quartz/netcdf-fortran/</env>
<env name="PNETCDF_PATH">/usr/tce/packages/parallel-netcdf/parallel-netcdf-1.12.3-mvapich2-2.3.7-intel-classic-2021.6.0</env>
</environment_variables>
</machine>
Expand All @@ -3096,11 +3096,11 @@
<MPILIBS>mpich</MPILIBS>
<PROJECT>cbronze</PROJECT>
<CIME_OUTPUT_ROOT>/p/lustre2/$USER/e3sm_scratch/quartz</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/usr/gdata/climdat/ccsm3data/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/usr/gdata/climdat/ccsm3data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DIN_LOC_ROOT>/usr/gdata/e3sm/ccsm3data/inputdata</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/usr/gdata/e3sm/ccsm3data/inputdata/atm/datm7</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/p/lustre2/$USER/archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>/p/lustre2/$USER/ccsm_baselines/$COMPILER</BASELINE_ROOT>
<CCSM_CPRNC>/usr/gdata/climdat/tools/cprnc</CCSM_CPRNC>
<CCSM_CPRNC>/usr/gdata/e3sm/tools/cprnc</CCSM_CPRNC>
<GMAKE_J>8</GMAKE_J>
<BATCH_SYSTEM>lc_slurm</BATCH_SYSTEM>
<SUPPORTED_BY>donahue5 -at- llnl.gov</SUPPORTED_BY>
Expand Down Expand Up @@ -3128,7 +3128,7 @@
<command name="load">intel-classic/2021.6.0-magic</command>
<command name="load">mvapich2/2.3.7</command>
<command name="load">cmake/3.19.2</command>
<command name="use --append">/usr/gdata/climdat/install/quartz/modulefiles</command>
<command name="use --append">/usr/gdata/e3sm/install/quartz/modulefiles</command>
<command name="load">hdf5/1.12.2</command>
<command name="load">netcdf-c/4.9.0</command>
<command name="load">netcdf-fortran/4.6.0</command>
Expand All @@ -3139,7 +3139,7 @@
<RUNDIR>$CIME_OUTPUT_ROOT/$CASE/run</RUNDIR>
<EXEROOT>$CIME_OUTPUT_ROOT/$CASE/bld</EXEROOT>
<environment_variables compiler="intel">
<env name="NETCDF_PATH">/usr/gdata/climdat/install/quartz/netcdf-fortran/</env>
<env name="NETCDF_PATH">/usr/gdata/e3sm/install/quartz/netcdf-fortran/</env>
<env name="PNETCDF_PATH">/usr/tce/packages/parallel-netcdf/parallel-netcdf-1.12.3-mvapich2-2.3.7-intel-classic-2021.6.0</env>
</environment_variables>
</machine>
Expand Down
48 changes: 31 additions & 17 deletions cime_config/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -610,40 +610,47 @@

"e3sm_scream_v1_lowres" : {
"time" : "01:00:00",
"inherit" : ("e3sm_scream_mam4xx_v1_lowres"),
"tests" : (
"ERP_D_Lh4.ne4_ne4.F2010-SCREAMv1",
"ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1",
"SMS_D_Ln9.ne4_ne4.F2010-SCREAMv1-noAero",
"ERP_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1",
"ERS_D_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-rad_frequency_2",
"ERP_D_Lh4.ne4_ne4.F2010-SCREAMv1.scream-output-preset-1",
"ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.scream-output-preset-2",
"SMS_D_Ln9.ne4_ne4.F2010-SCREAMv1-noAero.scream-output-preset-3",
"ERP_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-output-preset-4",
"ERS_D_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-rad_frequency_2--scream-output-preset-5",
)
},

"e3sm_scream_v1_dp-eamxx" : {
"time" : "01:00:00",
"tests" : (
"ERS_P16_Ln22.ne30_ne30.F2010-SCREAMv1-DP-DYCOMSrf01", # 225 phys cols, roughly size of ne2
)
},

# Tests run on exclusively on mappy for scream AT testing. These tests
# should be fast, so we limit it to low res and add some thread tests
# specifically for mappy.
"e3sm_scream_v1_at" : {
"inherit" : ("e3sm_scream_v1_lowres"),
"tests" : ("PET_Ln9_P32x2.ne4pg2_ne4pg2.F2010-SCREAMv1")
"inherit" : ("e3sm_scream_v1_lowres", "e3sm_scream_v1_dp-eamxx"),
"tests" : ("PET_Ln9_P32x2.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-output-preset-1")
},

"e3sm_scream_v1_medres" : {
"time" : "02:00:00",
"tests" : (
# "SMS_D_Ln2.ne30_ne30.F2000-SCREAMv1-AQP1", # Uncomment once IC file for ne30 is ready
"ERS_Ln22.ne30_ne30.F2010-SCREAMv1.scream-internal_diagnostics_level",
"PEM_Ln90.ne30pg2_ne30pg2.F2010-SCREAMv1",
"ERS_Ln90.ne30pg2_ne30pg2.F2010-SCREAMv1.scream-small_kernels",
"ERP_Ln22.conusx4v1pg2_r05_oECv3.F2010-SCREAMv1-noAero.scream-bfbhash",
"ERS_Ln22.ne30_ne30.F2010-SCREAMv1.scream-internal_diagnostics_level--scream-output-preset-3",
"PEM_Ln90.ne30pg2_ne30pg2.F2010-SCREAMv1.scream-spa_remap--scream-output-preset-4",
"ERS_Ln90.ne30pg2_ne30pg2.F2010-SCREAMv1.scream-small_kernels--scream-output-preset-5",
"ERP_Ln22.conusx4v1pg2_r05_oECv3.F2010-SCREAMv1-noAero.scream-bfbhash--scream-output-preset-6",
)
},

# Used to track performance
"e3sm_scream_v1_hires" : {
"time" : "03:00:00",
"time" : "01:00:00",
"tests" : (
"SMS_D_Ln12.ne120_r0125_oRRS18to6v3.F2010-SCREAMv1",
"SMS_Ln12.ne120_ne120.F2010-SCREAMv1",
# "SMS_Ln12.ne120_r0125_oRRS18to6v3.F2000-SCREAMv1-AQP1", add when aquap 120 inputs available
"SMS_Ln300.ne30pg2_ne30pg2.F2010-SCREAMv1.scream-perf_test--scream-output-preset-1"
)
},

Expand All @@ -655,7 +662,7 @@
# Disable the two 111422-commented tests b/c they fail on pm-gpu and
# we're not using MPASSI right now.
#111422 "ERP_Ln22.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.atmlndactive-rtm_off",
"ERS_D_Ln22.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.atmlndactive-rtm_off",
"ERS_D_Ln22.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.atmlndactive-rtm_off--scream-output-preset-1",
# "ERS_Ln22.ne30_oECv3.F2010-SCREAMv1-MPASSI.atmlndactive-rtm_off",
#111422 "PEM_Ln90.ne30pg2_EC30to60E2r2.F2010-SCREAMv1-MPASSI",
# "ERS_Ln22.ne30pg2_EC30to60E2r2.F2010-SCREAMv1-MPASSI.atmlndactive-rtm_off",
Expand All @@ -679,6 +686,14 @@
)
},

"e3sm_scream_mam4xx_v1_lowres" : {
"time" : "01:00:00",
"tests" : (
"SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-optics",
)
},


"e3sm_gpuacc" : {
"tests" : (
"SMS_Ld1.T62_oEC60to30v3.CMPASO-NYF",
Expand Down Expand Up @@ -1000,4 +1015,3 @@
"e3sm_superbfb_atm", "e3sm_superbfb_wcycl"),
},
}

4 changes: 2 additions & 2 deletions components/eam/src/dynamics/se/stepon.F90
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,8 @@ subroutine stepon_run3(dtime, cam_out, phys_state, dyn_in, dyn_out)
if (dp_crm) then

do ie=1,nelemd
out_gridx(:,:) = dyn_in%elem(ie)%spherep(:,:)%lat
out_gridy(:,:) = dyn_in%elem(ie)%spherep(:,:)%lon
out_gridx(:,:) = dyn_in%elem(ie)%spherep(:,:)%lon
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it fixed a bug.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep:

commit 4802bc8aed0ecb2f32dbeaa5405e9192e8aad4d6
Author: Peter Bogenschutz <[email protected]>
Date:   Tue Jan 9 13:47:55 2024 -0800

    fixes DP SCREAM output coordinate issue where x-coordinates should be assocated with spherep lon values and y-coordinates should be associated with lat values

diff --git a/components/eam/src/dynamics/se/stepon.F90 b/components/eam/src/dynamics/se/stepon.F90
index 831fd6d..38a3769 100644
--- a/components/eam/src/dynamics/se/stepon.F90
+++ b/components/eam/src/dynamics/se/stepon.F90
@@ -585,8 +585,8 @@ subroutine stepon_run3(dtime, cam_out, phys_state, dyn_in, dyn_out)
    if (dp_crm) then
 
      do ie=1,nelemd
-       out_gridx(:,:) = dyn_in%elem(ie)%spherep(:,:)%lat
-       out_gridy(:,:) = dyn_in%elem(ie)%spherep(:,:)%lon
+       out_gridx(:,:) = dyn_in%elem(ie)%spherep(:,:)%lon
+       out_gridy(:,:) = dyn_in%elem(ie)%spherep(:,:)%lat
        call outfld('crm_grid_x', out_gridx, npsq, ie)

I've updated the description.

out_gridy(:,:) = dyn_in%elem(ie)%spherep(:,:)%lat
call outfld('crm_grid_x', out_gridx, npsq, ie)
call outfld('crm_grid_y', out_gridy, npsq, ie)
enddo
Expand Down
13 changes: 7 additions & 6 deletions components/eam/src/physics/p3/scream/micro_p3.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1846,7 +1846,8 @@ subroutine get_rain_dsd2(qr,nr,mu_r,lamr,cdistr,logn0r)
real(rtype), intent(out) :: lamr,mu_r,cdistr,logn0r

!local variables:
real(rtype) :: inv_dum,lammax,lammin
real(rtype) :: lammax,lammin
real(rtype) :: mass_to_d3_factor

!--------------------------------------------------------------------------

Expand All @@ -1858,25 +1859,25 @@ subroutine get_rain_dsd2(qr,nr,mu_r,lamr,cdistr,logn0r)
! find spot in lookup table
! (scaled N/q for lookup table parameter space_
nr = max(nr,nsmall)
inv_dum = bfb_cbrt(qr/(cons1*nr*6._rtype))

! Apply constant mu_r: Recall the switch to v4 tables means constant mu_r
mu_r = mu_r_constant
lamr = bfb_cbrt(cons1*nr*(mu_r+3._rtype)*(mu_r+2._rtype)*(mu_r+1._rtype)/(qr)) ! recalculate slope based on mu_r
mass_to_d3_factor = cons1*(mu_r+3._rtype)*(mu_r+2._rtype)*(mu_r+1._rtype)
lamr = bfb_cbrt(mass_to_d3_factor*nr/qr) ! recalculate slope based on mu_r
lammax = (mu_r+1._rtype)*1.e+5_rtype ! check for slope
lammin = (mu_r+1._rtype)*500._rtype !500=1/(2mm) is inverse of max allowed number-weighted mean raindrop diameter

! apply lambda limiters for rain
if (lamr.lt.lammin) then
lamr = lammin
nr = bfb_exp(3._rtype*bfb_log(lamr)+bfb_log(qr)+bfb_log(bfb_gamma(mu_r+1._rtype))-bfb_log(bfb_gamma(mu_r+4._rtype)))/(cons1)
nr = lamr * lamr * lamr * qr / mass_to_d3_factor
elseif (lamr.gt.lammax) then
lamr = lammax
nr = bfb_exp(3._rtype*bfb_log(lamr)+bfb_log(qr)+bfb_log(bfb_gamma(mu_r+1._rtype))-bfb_log(bfb_gamma(mu_r+4._rtype)))/(cons1)
nr = lamr * lamr * lamr * qr / mass_to_d3_factor
endif

cdistr = nr/bfb_gamma(mu_r+1._rtype)
logn0r = bfb_log10(nr)+(mu_r+1._rtype)*bfb_log10(lamr)-bfb_log10(bfb_gamma(mu_r+1._rtype)) !note: logn0r is calculated as log10(n0r)
logn0r = bfb_log10(cdistr)+(mu_r+1._rtype)*bfb_log10(lamr) !note: logn0r is calculated as log10(n0r)

else

Expand Down
Loading