-
Notifications
You must be signed in to change notification settings - Fork 55
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
Adds MAM4xx: Aerosol wet scavenging interface #2848
Merged
bartgol
merged 71 commits into
E3SM-Project:master
from
eagles-project:oscar/wet_scav_strt_balwinder
Jul 30, 2024
Merged
Changes from all commits
Commits
Show all changes
71 commits
Select commit
Hold shift + click to select a range
636c765
wet_scav - get code from balwinder branch.
odiazib 61fb835
wet_scav - update interface
odiazib 912e0bc
wet_scav - using compute_calcsize_and_water_uptake_dr
odiazib 68c9a9d
wet_scav - delete old code.
odiazib cc8ecaf
wet_scav - remove private member of parallel_for
odiazib 9818035
wet_scav - add dig variables. Unit tests is working.
odiazib 7d3cbff
wet_scav - update interface
odiazib 8363b75
wet_scav - test is working in cpu/gpus.
odiazib 604c2fa
wet_scav - adding single-process.
odiazib d0db05b
wet_dep - update to match mam4xx interface.
odiazib 1ac385d
wet_dep - update mam4xx interface.
odiazib c5c0cfa
wet_dep - update name of tendencies.
odiazib 593c8b1
wet_scav - rebase code
odiazib a76689c
wet_scav - adding missing input variable.
odiazib 5cd64ae
wet_scav - removing old comments and variables that not needed.
odiazib 711199b
wet_scav - updating code after rebase.
odiazib 1b80528
wet_scav - Adding missing variables in input file.
odiazib 8ec139c
wet_scav - Moving 'aerdepwetis' and 'aerdepwetcw' to the field manage…
odiazib 7ced79a
wet_scav - Removing headers that are part of mam_coupling and unused …
odiazib 6b6a79d
wet_scav - Adding output fields.
odiazib d39659a
wet_scav - Adding outputs and running test for 3 steps.
odiazib 6e81baa
wet_sav- removin unused input.
odiazib 5b0b243
wet_sav - Adding FIXME.
odiazib 6e55317
wet_sav - Updating comments.
odiazib 8cd04d2
wet_scav - Setting Frequency=2
odiazib e91b2e2
wet_scav - Adding multi-process test for mam4_wetsav.
odiazib 2570f06
wet_sav - Adding wetscav to namelist.
odiazib 7b1471d
wet_scav - Removing initial values of pbl_height and phis from nameli…
odiazib 25d4a91
wet_scav - Adding line in CMakeLists.
odiazib 3e6bf35
wet_scav - Update interstitial aerosol state.
odiazib a55b7a7
A working CIME case with wetscav in the process list at the right place
singhbalwinder 7299556
Fixes single process test
singhbalwinder cf73f93
Fixes file for the mam4xx standalone tests
singhbalwinder f65792d
Removing uncoupled test files since they are renamed as single proces…
singhbalwinder 0327c9e
Clang format and makes dp_frac and input, updates mam4xx submodule to…
singhbalwinder 14efd0d
Makes cldt intent-in (include changes to the mam4xx submodule)
singhbalwinder 6ada930
Makes some more convective fields intent-in (updates submodule mam4xx)
singhbalwinder 04ae764
Fixes some more vars to be intent-in (mam4xx submodule updated)
singhbalwinder b4ffbe9
Moved around variables to match I/O-1
singhbalwinder abd75db
Removes ptend from output FM and some cleanup for I/O-2
singhbalwinder 6c819c8
Done with the initialize_impl method cleanup
singhbalwinder 3e73b8f
Rebased on current master
singhbalwinder f52f628
Completed a round of cleanup- variables rearranged to match i/o-3
singhbalwinder 870e978
Adds a multi-process test: p3-wetscav
singhbalwinder 8a81e1c
Adds missing files for the new multi-process test
singhbalwinder 64fc5a3
Adds another multi-process test for wetscav
singhbalwinder 0ec3227
updated submodule to a newer version
singhbalwinder d00cd50
Cleans wetscav hpp file and minor changes to the cpp file
singhbalwinder dd7e21b
Adds descriptive var names; removes conv vars from FM; fixes input an…
singhbalwinder e6610dd
Adds const for input vars, removes scorpio temp change
singhbalwinder 8c7d2a7
Cleans up namelist xml file and removes double ICs
singhbalwinder 83a85eb
Removes a left over comment
singhbalwinder 140ee78
Minor change in comments
singhbalwinder aed9ffc
wet_scav - Removing Kokkos::resize.
odiazib 019a54c
Fixes some test fails: remove old output varnames, fixed output nc fi…
singhbalwinder fe66519
Adds TODO to a comment as some editors can highlight these comments
singhbalwinder af58453
Fixes previous commit: Adds a TODO comment here
singhbalwinder 4d3b7bc
Adds a new function to add additional tracers for MAM4xx
singhbalwinder 6de6c33
Adds the new script for computing number of tracers
singhbalwinder 54f7110
Fixes script to update tracer number in scream cmake options
singhbalwinder b00a709
Adds missing call to update the state (int and cldbrn aerosols)
singhbalwinder 4734cac
Updates number mixing ratios for state
singhbalwinder 1323ea6
Zero out tends before computing tends as they had junk values
singhbalwinder f8e206d
Ensure that Kokkos::deep_copy is called outside of parallel_for.
odiazib 9cb990c
wet_scav - Fixing compilation errors.
odiazib 047802b
Updates mam4xx submodule-pointed to main for wetscav qqcw update
singhbalwinder c75615f
Submodule update: declare local vrs for device code
singhbalwinder 1f77bf0
Changes due to code review feedback.
overfelt 2890ec1
Changes due to code review feedback.
overfelt 8fd0eae
Changes due to code review feedback.
overfelt 29d83eb
Revert "Changes due to code review feedback."
overfelt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 5 additions & 3 deletions
8
components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/aci/shell_commands
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 5 additions & 4 deletions
9
components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/optics/shell_commands
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
...onents/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/update_eamxx_num_tracers.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
#!/bin/sh | ||
|
||
#------------------------------------------------------ | ||
# MAM4xx adds additional tracers to the simulation | ||
# Increase number of tracers for MAM4xx simulations | ||
#------------------------------------------------------ | ||
|
||
# Additional MAM4xx tracers (MAM4xx adds 31 tracers) | ||
ADDITIONAL_MAM4xx_TRACERS=31 | ||
|
||
# Original CMAKE options in env_build.xml | ||
orig_cmake_opt=`./xmlquery --value SCREAM_CMAKE_OPTIONS` | ||
|
||
# Extract the number of tracers | ||
orig_tracer_num=$(echo $orig_cmake_opt | grep -oP 'SCREAM_NUM_TRACERS \K[0-9]+') | ||
|
||
# Update number of tracers | ||
new_tracer_num=$((orig_tracer_num + ADDITIONAL_MAM4xx_TRACERS)) | ||
|
||
# Form the new CMake options string by replacing the original number with the new number | ||
new_cmake_opt=$(echo $orig_cmake_opt | sed "s/SCREAM_NUM_TRACERS $orig_tracer_num/SCREAM_NUM_TRACERS $new_tracer_num/") | ||
|
||
# Update cmake options string | ||
`./xmlchange SCREAM_CMAKE_OPTIONS="$new_cmake_opt"` |
13 changes: 13 additions & 0 deletions
13
components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/wetscav/shell_commands
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/bin/sh | ||
#------------------------------------------------------ | ||
# MAM4xx adds additionaltracers to the simulation | ||
# Increase number of tracers for MAM4xx simulations | ||
#------------------------------------------------------ | ||
|
||
$CIMEROOT/../components/eamxx/cime_config/testdefs/testmods_dirs/scream/mam4xx/update_eamxx_num_tracers.sh -b | ||
|
||
#------------------------------------------------------ | ||
#Update IC file and add wetscav process | ||
#------------------------------------------------------ | ||
$CIMEROOT/../components/eamxx/scripts/atmchange initial_conditions::Filename='$DIN_LOC_ROOT/atm/scream/init/screami_mam4xx_ne4np4L72_c20240208.nc' -b | ||
$CIMEROOT/../components/eamxx/scripts/atmchange physics::atm_procs_list="mac_aero_mic,mam4_wetscav,rrtmgp" -b |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You don't really need to sed the content SCREAM_CMAKE_OPTIONS. You can just do
./xmlchange --append SCREAM_CMAKE_OPTIONS="SCREAM_NUM_TRACERS $new_tracer_num"
In case of a repeated cmake option, the
buildlib_cmake
script in eamxx will honor the last one.