-
Notifications
You must be signed in to change notification settings - Fork 171
cam6_3_020: MPAS bug fixes, performance enhancements, allow initial files writes, refactor/cleanup #303
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
cam6_3_020: MPAS bug fixes, performance enhancements, allow initial files writes, refactor/cleanup #303
Changes from 3 commits
ce969e5
f95085f
17430cd
55cc749
bf44227
8725316
744cef6
0f0bc86
c7784ea
4273a26
e94dd8d
19cd4c4
6f82fbf
face455
dff8425
6249eb8
8d9066e
9368dbc
3a83b5f
12b2b24
38498c2
8a35da0
97002e7
06e8700
db9548b
61b9ef5
0113536
c35311e
ffe26ff
fa1b9f1
11f0f44
6b110d8
6f76adf
4da11a1
c9383e6
24121b5
cde52b2
fa79940
02e503f
0e87e44
3852251
610c8cf
462c073
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,129 @@ | ||
| =============================================================== | ||
|
|
||
| Tag name: | ||
| Originator(s): | ||
| Date: | ||
| One-line Summary: | ||
| Github PR URL: | ||
|
||
|
|
||
| Purpose of changes (include the issue number and title text for each relevant GitHub issue): | ||
|
|
||
| . Remove unused code in build-namelist for generating MPAS streams files. | ||
|
|
||
| . Fix to allow MPAS to run with 1 task. | ||
|
|
||
| . Fix to allow MPAS to run with NAG/debug. | ||
|
|
||
| . Replace bad grid file for running 480-km res with no topo. | ||
|
|
||
| . Fix for bug when MPAS dycore is substepping during physics timestep. | ||
|
|
||
| . Update calculation of hydrostatic pressure from MPAS state. | ||
|
|
||
| . Add ability to write initial file when using MPAS dycore. | ||
|
|
||
| Describe any changes made to build system: | ||
nusbaume marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| Describe any changes made to the namelist: | ||
|
|
||
| List any changes to the defaults for the boundary datasets: | ||
|
|
||
| Describe any substantial timing or memory changes: | ||
|
|
||
| Code reviewed by: | ||
|
|
||
gold2718 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| List all files eliminated: | ||
|
|
||
| List all files added and what they do: | ||
|
|
||
| List all existing files that have been modified, and describe the changes: | ||
|
|
||
| bld/build-namelist | ||
| . remove code that executes the mpas streams_gen utility. It's not being | ||
| used. | ||
|
|
||
| bld/namelist_files/namelist_defaults_cam.xml | ||
| . replace mpas grid file mpasa480_L32_v6.1.grid_c190924.nc by | ||
| mpasa480_L32_notopo_grid_c201125.nc | ||
| . new defaults: longer time step, change 3rd-order scalar transport upwind coefficient | ||
| mpas_dt 600s => 900s | ||
| mpas_coef_3rd_order 0.25 => 1.0 | ||
|
Comment on lines
11
to
50
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please point to issues that describe the need for each of these changes (as noted in the instructions). I do not currently see any issues addressed by this PR, please link to them or open them as needed.
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. New issue: #385
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. While this looks like efficiency on the surface, it costs us a lot of time on the back end. The issues are our record and database for discussions of what needed fixing and why. Please trim #385 to match what is fixed in this PR and add a line to that effect in the PR title (see item 10 of the CAM SE PR procedures or the GitHub issue-closing syntax.
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Will do. |
||
|
|
||
| src/dynamics/mpas/dyn_comp.F90 | ||
| . Add target attribute to the module data arrays for height which are | ||
| pointed to by the hist_coords objects in the cam_history_support module. | ||
| NAG/debug requires this. | ||
| . remove the variable swap_time_level_ptrs | ||
| . cam_mpas_namelist_read | ||
| - allow the &decomposition namelist group to be missing by removing the | ||
| endrun call. When running with 1 task the partition file specified in | ||
| this group is not read. | ||
| . dyn_init | ||
| - change the dyn_out components with 2 time levels to point to the same | ||
| memory locations as the dyn_in components | ||
| - remove the code that copied dyn_in to dyn_out. The dyn_out pointers now point | ||
| to the same memory locations as the dyn_in pointers. | ||
| - remove setting swap_time_level_ptrs | ||
| . dyn_run | ||
| - after call to cam_mpas_run update the dyn_in/dyn_out pointers to point | ||
| to the MPAS current state in pool arrays with timeLevel=1 | ||
| . read_inidat | ||
| - update computation of hydrostatic pressure profiles. | ||
| . set_base_state | ||
| - update computation of hydrostatic pressure used by base state. | ||
|
|
||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Double check that all the modified files are accurately reflected here. (Externals.cfg is not listed though it now has change)
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I added documentation for Externals.cfg, diagnostics.F90 and listed subroutines that were removed when adopting weak scaling fixes. I'll have one more update when I run the official regression tests and will push this file before tagging. |
||
| src/dynamics/mpas/stepon.F90 | ||
| . stepon_run1 | ||
| - remove code to swap pointers after d_p_coupling | ||
| . shift_time_levels | ||
| - remove this routine. no longer needed. | ||
| . write_initial_file | ||
| - new subroutine to generate the initial filename, open a pio filehandle | ||
| to that file, and call the same mpas routines that are used to write to | ||
| the restart file. | ||
| . write_dynvar | ||
| - add conditional using write_inithist to call write_initial_file and | ||
| have MPAS write the initial file. | ||
|
|
||
|
|
||
| If there were any failures reported from running test_driver.sh on any test | ||
| platform, and checkin with these failures has been OK'd by the gatekeeper, | ||
| then copy the lines from the td.*.status files for the failed tests to the | ||
| appropriate machine below. All failed tests must be justified. | ||
|
|
||
| cheyenne/intel/aux_cam: | ||
|
|
||
| izumi/nag/aux_cam: | ||
gold2718 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| izumi/pgi/aux_cam: | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The entry in namelist_definition.xml uses the word,
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @PeterHjortLauritzen below is the wording I currently have in namelist_definition.xml. I'm no longer sure which of the terminology is yours, mine or Michaels. Would you address Steve's concern (re mixing and diffusion) as well as any of your own and modify the following definition? I will update the ChangeLog and namelist definition file to use your version. ================ |
||
|
|
||
| CAM tag used for the baseline comparison tests if different than previous | ||
| tag: | ||
|
|
||
| Summarize any changes to answers, i.e., | ||
| - what code configurations: | ||
| - what platforms/compilers: | ||
| - nature of change (roundoff; larger than roundoff but same climate; new | ||
| climate): | ||
|
|
||
| If bitwise differences were observed, how did you show they were no worse | ||
| than roundoff? | ||
|
|
||
| If this tag changes climate describe the run(s) done to evaluate the new | ||
| climate in enough detail that it(they) could be reproduced, i.e., | ||
| - source tag (all code used must be in the repository): | ||
| - platform/compilers: | ||
| - configure commandline: | ||
| - build-namelist command (or complete namelist): | ||
| - MSS location of output: | ||
|
|
||
| MSS location of control simulations used to validate new climate: | ||
|
|
||
| URL for AMWG diagnostics output used to validate new climate: | ||
|
|
||
| =============================================================== | ||
| =============================================================== | ||
|
|
||
| Tag name: cam6_3_006 | ||
| Originator(s): herrington, cacraig | ||
| Date: Dec 3, 2020 | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.