Commit f8daa56
Implement CAM4 aquaplanet (QPC4) configuration (#460)
Tag name (required for release branches): sima0_11_000
Originator(s): nusbaume
Description (include the issue title, and the keyword ['closes',
'fixes', 'resolves'] followed by the issue number):
Add updates and modifications needed to run the CAM4 aquaplanet
configuration with prescribed SSTs (QPC4), at least with the MPAS
dycore. This includes replacing the FCAM4 test with a QPC4 test.
Also updates the externals (submodules) and git-fleximod version to
match cam6_4_143.
Describe any changes made to build system:
M cime_config/cam_config.py
- Add 'aquaplanet' config option and remove unused 'ocn' option, and add
nitrogen deposition namelist.
M cime_config/config_component.xml
- Make sure the 'aquaplanet' configuration is properly set based off the
compset entry.
M cime_config/config_pes.xml
- Update file to match cam6_4_143
M src/data/generate_registry_data.py
- Ensure that CAM-SIMA uses the correct number of CCPP constituents when
allocating variables in the registry.
Describe any changes made to the namelist:
A cime_config/usermods_dirs/aquap/user_nl_cpl
M cime_config/namelist_definition_cam.xml
M src/data/namelist_definition_physconst.xml
- Add modifications needed for CAM4 aquaplanet configurations with the
MPAS dycore, and update ParamGen XML version where applicable.
M src/data/namelist_definition_ref_pres.xml
M src/dynamics/mpas/namelist_definition_mpas_dycore.xml
M src/dynamics/se/namelist_definition_se_dycore.xml
M src/dynamics/tests/namelist_definition_analy_ic.xml
- Update ParamGen XML version.
List any changes to the defaults for the input datasets (e.g. boundary
datasets): N/A
List all files eliminated and why:
D components/cism
- The CISM submodule was removed from CAM, so removing it here as well.
List all files added and what they do:
List all existing files that have been modified, and describe the
changes:
(Helpful git command: `git diff --name-status
development...<your_branch_name>`)
M .gitmodules
M ccs_config
M cime
M components/cdeps
M components/cice
M components/cmeps
M components/mizuRoute
M share
M tools/CUPiD
- Update externals (git submodules) to match cam6_4_143.
M src/physics/ncar_ccpp
- Update atmospheric_physics submodule to point to branch with needed
CAM4 modifications.
M .lib/git-fleximod/.github/workflows/pytest.yaml
M .lib/git-fleximod/.pre-commit-config.yaml
M .lib/git-fleximod/CODE_OF_CONDUCT.md
M .lib/git-fleximod/git_fleximod/cli.py
M .lib/git-fleximod/git_fleximod/git_fleximod.py
M .lib/git-fleximod/git_fleximod/gitinterface.py
M .lib/git-fleximod/git_fleximod/gitmodules.py
M .lib/git-fleximod/git_fleximod/metoflexi.py
M .lib/git-fleximod/git_fleximod/submodule.py
M .lib/git-fleximod/git_fleximod/utils.py
M .lib/git-fleximod/poetry.lock
M .lib/git-fleximod/pyproject.toml
M .lib/git-fleximod/tbump.toml
M .lib/git-fleximod/tests/conftest.py
M .lib/git-fleximod/tests/test_a_import.py
M .lib/git-fleximod/tests/test_b_update.py
M .lib/git-fleximod/tests/test_c_required.py
M .lib/git-fleximod/tests/test_d_complex.py
M .lib/git-fleximod/tests/test_e_complex_update.py
A .lib/git-fleximod/tests/utils_for_tests.py
- Update git-fleximod version to match cam6_4_143.
M cime_config/testdefs/testlist_cam.xml
R100
cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam_analy_ic_cam4/shell_commands
cime_config/testdefs/testmods_dirs/cam/outfrq_analy_ic_cam4/shell_commands
R100
cime_config/testdefs/testmods_dirs/cam/outfrq_se_cslam_analy_ic_cam4/user_nl_cam
cime_config/testdefs/testmods_dirs/cam/outfrq_analy_ic_cam4/user_nl_cam
- Replace FCAM4 with QPC4 test using MPAS dycore and analytic ICs.
M src/control/runtime_opts.F90
- Add Nitrogen deposition namelist read, and remove all other
commented-out subroutine calls.
M src/cpl/nuopc/atm_comp_nuopc.F90
M src/cpl/nuopc/atm_import_export.F90
- Update NUOPC coupling layer to allow for the exchange of variables
between CAM-SIMA and the coupler, at least when running in a CAM4
aquaplanet configuration.
M src/cpl/nuopc/atm_stream_ndep.F90
- Clean-up use statements, and ensure that the subroutines build and run
correctly when in a CAM4 aquaplanet configruation.
M src/dynamics/mpas/dyn_comp_impl.F90
M src/dynamics/mpas/dyn_coupling_impl.F90
- Ensure that advected constituents are handled correctly when
non-advected constituents also exist.
M src/physics/utils/cam_constituents.F9
- Add "is_advected" check, and print out the names of all registered
constituents to the atm log file.
M src/physics/utils/phys_comp.F90
- Ensure that the IC file is only read once for non-null dycore runs.
M src/physics/utils/physics_data.F90
- Add additional log output, and namelist controls for certain other log
outputs.
M src/physics/utils/pio_reader.F90
- Make sure output strings are trimmed.
M test/unit/python/sample_files/physics_types_complete.F90
M test/unit/python/test_cam_config.py
- Update unit tests to properly handle code changes from this PR.
If there are new failures (compared to the
`test/existing-test-failures.txt` file),
have them OK'd by the gatekeeper, note them here, and add them to the
file.
If there are baseline differences, include the test and the reason for
the
diff. What is the nature of the change? Roundoff?
derecho/intel/aux_sima:
Most tests have NLCOMP failures due to the PE layout changes and the
addition of the nitrogen deposition namelist.
SMS_Ln9.mpasa120_mpasa120.QPC4.derecho_intel.cam-outfrq_analy_ic_cam4
- New regression test (no baselines).
SMS_Ln9.ne3pg3_ne3pg3_mg37.FKESSLER.derecho_intel.cam-outfrq_se_cslam_multitape
(Overall: NLFAIL)
- Expected failure.
derecho/gnu/aux_sima:
Most tests have NLCOMP failures due to the PE layout changes and the
addition of the nitrogen deposition namelist.
SMS_Ln9.mpasa120_mpasa120.QPC4.derecho_gnu.cam-outfrq_analy_ic_cam4
(Overall: DIFF)
- New regression test (no baselines).
SMS_Ln2.ne3pg3_ne3pg3_mg37.FPHYStest.derecho_gnu.cam-outfrq_hb_vdiff_derecho
(Overall: DIFF)
- Answer changes due to new sponge layer properties from
ESCOMP/atmospheric_physics#348
If this changes climate describe any run(s) done to evaluate the new
climate in enough detail that it(they) could be reproduced:
Changes climate for CAM4 aquaplanet runs with the MPAS dycore,
prescribed SSTs, and analytic ICs.
CAM-SIMA date used for the baseline comparison tests if different than
latest:
---------
Co-authored-by: Courtney Peverley <courtneyp@izumi.cgd.ucar.edu>
Co-authored-by: peverwhee <courtneyp@ucar.edu>
Co-authored-by: Haipeng Lin <hplin@ucar.edu>
Co-authored-by: Haipeng Lin <myself@jimmielin.me>1 parent 8ad34dd commit f8daa56
59 files changed
Lines changed: 3328 additions & 2376 deletions
File tree
- .lib/git-fleximod
- .github/workflows
- git_fleximod
- tests
- cime_config
- testdefs
- testmods_dirs/cam/outfrq_analy_ic_cam4
- usermods_dirs/aquap
- components
- src
- control
- cpl/nuopc
- data
- dynamics
- mpas
- se
- tests
- physics
- utils
- test/unit/python
- sample_files
- tools
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
35 | | - | |
| 35 | + | |
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
53 | | - | |
| 53 | + | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | 56 | | |
63 | 57 | | |
64 | 58 | | |
| |||
68 | 62 | | |
69 | 63 | | |
70 | 64 | | |
71 | | - | |
| 65 | + | |
72 | 66 | | |
73 | 67 | | |
74 | 68 | | |
| |||
80 | 74 | | |
81 | 75 | | |
82 | 76 | | |
83 | | - | |
| 77 | + | |
84 | 78 | | |
85 | 79 | | |
86 | 80 | | |
| |||
104 | 98 | | |
105 | 99 | | |
106 | 100 | | |
107 | | - | |
| 101 | + | |
108 | 102 | | |
109 | 103 | | |
110 | 104 | | |
111 | 105 | | |
112 | 106 | | |
113 | | - | |
| 107 | + | |
114 | 108 | | |
115 | 109 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
76 | | - | |
77 | | - | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
| 63 | + | |
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | | - | |
| 4 | + | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | | - | |
26 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
27 | 42 | | |
28 | 43 | | |
29 | 44 | | |
| |||
40 | 55 | | |
41 | 56 | | |
42 | 57 | | |
| 58 | + | |
43 | 59 | | |
44 | 60 | | |
45 | 61 | | |
| |||
116 | 132 | | |
117 | 133 | | |
118 | 134 | | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
119 | 142 | | |
120 | 143 | | |
121 | 144 | | |
| |||
0 commit comments