|
1 | | -nudging variables being allocated and never used (many of these were 3D |
2 | | -variables). These have been removed. |
3 | | -Some other minor clean-up as well. |
4 | | -Changes are bit for bit. |
5 | | - |
6 | | -Expect baseline failures for all SE tests except WACCM-x due to sponge changes |
7 | 1 | =============================================================== |
8 | 2 |
|
9 | | -Tag name: |
10 | | -Originator(s): |
11 | | -Date: |
12 | | -One-line Summary: remove dependence on nlev for some namelist defaults |
13 | | -Github PR URL: |
| 3 | +Tag name: cam6_4_075 |
| 4 | +Originator(s): PeterHjortLauritzen, bstephens82, brian-eaton, swrneale, jimmielin |
| 5 | +Date: March 7, 2025 |
| 6 | +One-line Summary: Clean up (all SE dycore) plus other misc |
| 7 | +Github PR URL: https://github.com/ESCOMP/CAM/pull/1214 |
14 | 8 |
|
15 | 9 | Purpose of changes (include the issue number and title text for each relevant GitHub issue): |
16 | 10 |
|
17 | | -Resolve #819 - dependance of some namelist default on the number of |
18 | | - vertical levels (lev)? |
| 11 | +Remove nudging variables being allocated and never used, |
| 12 | +as well as some other minor clean-up, in the SE dycore (no issue). |
| 13 | + |
| 14 | +Updated the CAM license to Apache 2.0 (no issue). |
| 15 | + |
| 16 | +Resolves #819 - dependance of some namelist default on the number of |
| 17 | + vertical levels (lev)? |
19 | 18 | - There are just two variables other than ncdata that have an nlev |
20 | 19 | attribute. Those entries can be removed because there are no compsets |
21 | 20 | that use them. |
22 | 21 |
|
23 | | -Describe any changes made to build system: none |
| 22 | +Resolves #844 - Crash when running cam_dev with SILHS |
24 | 23 |
|
25 | | -Describe any changes made to the namelist: none |
| 24 | +Resolves #1250 - Change the 'parcel_hscale' parameter in the |
| 25 | + ZM convection to a namelist parameter |
26 | 26 |
|
27 | | -List any changes to the defaults for the boundary datasets: none |
| 27 | +Resolves #1254 - Incorrect freqsh definition in shallow |
| 28 | + convection diagnostics |
28 | 29 |
|
29 | | -Describe any substantial timing or memory changes: none |
| 30 | +Describe any changes made to build system: N/A |
30 | 31 |
|
31 | | -Code reviewed by: |
| 32 | +Describe any changes made to the namelist: |
32 | 33 |
|
33 | | -List all files eliminated: none |
| 34 | +M bld/build-namelist |
| 35 | +M bld/namelist_files/namelist_defaults_cam.xml |
| 36 | +M bld/namelist_files/namelist_definition.xml |
| 37 | + - Add new 'zmconv_parcel_hscale' namelist variable |
| 38 | + - Remove entry for effgw_oro w/ nlev=60 |
| 39 | + - Remove entry effgw_beres_dp w/ nlev=110 |
34 | 40 |
|
35 | | -List all files added and what they do: none |
| 41 | +List any changes to the defaults for the boundary datasets: N/A |
| 42 | + |
| 43 | +Describe any substantial timing or memory changes: N/A |
| 44 | + |
| 45 | +Code reviewed by: nusbaume, cacraigucar, Katetc, fvitt |
| 46 | + |
| 47 | +List all files eliminated: N/A |
| 48 | + |
| 49 | +List all files added and what they do: N/A |
36 | 50 |
|
37 | 51 | List all existing files that have been modified, and describe the changes: |
38 | 52 |
|
39 | | -bld/namelist_files/namelist_defaults_cam.xml |
40 | | -. remove entry for effgw_oro w/ nlev=60 |
41 | | -. remove entry effgw_beres_dp w/ nlev=110 |
| 53 | +M LICENSE |
| 54 | + - Updated CAM license to Apache 2.0 |
| 55 | + |
| 56 | +M .gitmodules |
| 57 | +M src/atmos_phys |
| 58 | +M src/physics/cam/zm_conv_intr.F90 |
| 59 | + - Add new 'zmconv_parcel_hscale' namelist variable |
| 60 | + |
| 61 | +M src/dynamics/se/dycore/control_mod.F90 |
| 62 | +M src/dynamics/se/dycore/dimensions_mod.F90 |
| 63 | +M src/dynamics/se/dycore/element_mod.F90 |
| 64 | +M src/dynamics/se/dycore/fvm_consistent_se_cslam.F90 |
| 65 | +M src/dynamics/se/dycore/prim_advance_mod.F90 |
| 66 | +M src/dynamics/se/dycore/prim_advection_mod.F90 |
| 67 | +M src/dynamics/se/dycore/prim_init.F90 |
| 68 | +M src/dynamics/se/dycore/viscosity_mod.F90 |
| 69 | +M src/dynamics/se/dyn_comp.F90 |
| 70 | +M src/dynamics/se/stepon.F90 |
| 71 | + - SE dycore cleanup, including removal of unused variables |
| 72 | + |
| 73 | +M src/physics/cam/convect_shallow.F90 |
| 74 | + - Fix 'freqsh' diagnostic calculation |
| 75 | + |
| 76 | +M src/physics/cam7/micro_pumas_cam.F90 |
| 77 | + - Fix crashing bug when using SILHS with cam_dev/CAM7 |
42 | 78 |
|
43 | 79 | If there were any failures reported from running test_driver.sh on any test |
44 | 80 | platform, and checkin with these failures has been OK'd by the gatekeeper, |
45 | 81 | then copy the lines from the td.*.status files for the failed tests to the |
46 | 82 | appropriate machine below. All failed tests must be justified. |
47 | 83 |
|
| 84 | +All tests with ZM deep convection enabled will have NLCOMP failures |
| 85 | +due to the presence of the new 'zmconv_parcel_hscale' namelist variable |
| 86 | + |
48 | 87 | derecho/intel/aux_cam: |
49 | 88 |
|
50 | | -derecho/nvhpc/aux_cam: |
| 89 | +ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL) |
| 90 | +SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF) |
| 91 | + - pre-existing failures due to HEMCO not having reproducible results (issues #1018 and #856) |
| 92 | + |
| 93 | +SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL) |
| 94 | +SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) |
| 95 | + - pre-existing failures due to build-namelist error requiring CLM/CTSM external update |
| 96 | + |
| 97 | +derecho/nvhpc/aux_cam: All pass except expected NLCOMP failure |
51 | 98 |
|
52 | 99 | izumi/nag/aux_cam: |
53 | 100 |
|
|
0 commit comments