Skip to content

Commit b0c6f1a

Browse files
brian-eatonSteve Goldhaber
authored andcommitted
ESCOMP tag: cam6_4_067
Merge pull request ESCOMP#1217 from brian-eaton/rm-spcam cam6_4_067: Remove SPCAM ESCOMP commit: a01a051
1 parent eeb1fb2 commit b0c6f1a

File tree

194 files changed

+217
-99665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+217
-99665
lines changed

cime_config/config_pes.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2057,18 +2057,6 @@
20572057
<overrides>
20582058
<grid name="any" >
20592059
<mach name="any" >
2060-
<pes pesize="any" compset="SPCAM[SM]">
2061-
<nthrds>
2062-
<nthrds_atm>1</nthrds_atm>
2063-
<nthrds_lnd>1</nthrds_lnd>
2064-
<nthrds_rof>1</nthrds_rof>
2065-
<nthrds_ice>1</nthrds_ice>
2066-
<nthrds_ocn>1</nthrds_ocn>
2067-
<nthrds_glc>1</nthrds_glc>
2068-
<nthrds_wav>1</nthrds_wav>
2069-
<nthrds_cpl>1</nthrds_cpl>
2070-
</nthrds>
2071-
</pes>
20722060
<pes pesize="any" compset="SCAM.*">
20732061
<comment>none</comment>
20742062
<ntasks>

doc/ChangeLog

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,140 @@
11
===============================================================
22

3+
Tag name: cam6_4_067
4+
Originator(s): eaton
5+
Date: 15 February 2025
6+
One-line Summary: Remove SP-CAM
7+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1217
8+
9+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
10+
11+
Resolve #1171 - Remove SP-CAM from cam_development
12+
13+
Describe any changes made to build system:
14+
. remove spcam build options
15+
16+
Describe any changes made to the namelist:
17+
. remove spcam namelist options
18+
19+
List any changes to the defaults for the boundary datasets: none
20+
21+
Describe any substantial timing or memory changes: none
22+
23+
Code reviewed by: cacraig
24+
25+
List all files eliminated:
26+
doc/ReleaseNotes
27+
. This file hasn't been updated since cam5.4. Put this information
28+
somewhere else.
29+
30+
src/physics/cam/spcam_drivers.F90
31+
src/physics/spcam/*
32+
src/physics/spcam/crm/*
33+
src/physics/spcam/crm/ADV_MPDATA/*
34+
src/physics/spcam/crm/CLUBB/*
35+
src/physics/spcam/crm/MICRO_M2005/*
36+
src/physics/spcam/crm/MICRO_SAM1MOM/*
37+
src/physics/spcam/crm/SGS_CLUBBkvhkvm/*
38+
src/physics/spcam/crm/SGS_TKE/*
39+
src/physics/spcam/ecpp/*
40+
. remove all SPCAM source and drivers
41+
42+
List all files added and what they do: none
43+
44+
List all existing files that have been modified, and describe the changes:
45+
46+
bld/build-namelist
47+
. remove dependencies on spcam
48+
49+
bld/config_files/definition.xml
50+
. remove 'phys' options spcam_sam1mom and spcam_m2005
51+
. remove 'microphys' options spcam_sam1mom and spcam_m2005
52+
. remove 'macrophys' options spcam_sam1mom and spcam_m2005
53+
. remove 'pbl' options spcam_sam1mom and spcam_m2005
54+
. remove parameters 'spcam_clubb_sgs', 'spcam_nx', 'spcam_ny', 'spcam_nz',
55+
'spcam_dx', 'spcam_dt'
56+
57+
bld/configure
58+
. remove -phys options spcam_sam1mom and spcam_m2005
59+
. remove commandline options -spcam_clubb_sgs, -spcam_nx, -spcam_ny,
60+
-spcam_dx, -spcam_dt
61+
. remove code paths for spcam:
62+
src/physics/spcam/
63+
src/physics/spcam/crm/
64+
src/physics/spcam/crm/ADV_MPDATA/
65+
src/physics/spcam/crm/MICRO_SAM1MOM/
66+
src/physics/spcam/crm/MICRO_M2005/
67+
src/physics/spcam/crm/CLUBB/
68+
src/physics/spcam/crm/SGS_CLUBBkvhkvm/
69+
src/physics/spcam/crm/SGS_TKE/
70+
src/physics/spcam/ecpp/
71+
72+
bld/namelist_files/namelist_defaults_cam.xml
73+
. remove dependencies on phys, microphys, macrophys, and pbl attributes
74+
spcam_sam1mom and spcam_m2005
75+
. remove dependencies on spcam_clubb_sgs attribute
76+
77+
bld/namelist_files/namelist_definition.xml
78+
. remove SPCAM_sam1mom and SPCAM_m2005 as valid values for microp_scheme,
79+
shallow_scheme, and eddy_scheme
80+
81+
cime_config/config_component.xml
82+
. remove physics options %SPCAMS, %SPCAMCLBS, %SPCAMM, %SPCAMCLBM
83+
84+
cime_config/config_compsets.xml
85+
. remove F2000Nuopc - not used
86+
. remove QSPCAMS, QPSPCAMM, FSPCAMM, FSPCAMS
87+
. remove FSPCAMCLBS, FSPCAMCLBM
88+
. remove SPCAM settings for NTHRDS_[ATM,CPL,ESP,GLC,ICE,LND,OCN,ROF,WAV]
89+
90+
cime_config/config_pes.xml
91+
. remove settings for SPCAM*
92+
93+
cime_config/testdefs/testlist_cam.xml
94+
. remove tests for SPCAM*
95+
96+
src/chemistry/modal_aero/aero_model.F90
97+
src/physics/cam/cloud_diagnostics.F90
98+
src/physics/cam/cloud_fraction.F90
99+
src/physics/cam/conv_water.F90
100+
src/physics/cam/convect_deep.F90
101+
src/physics/cam/convect_shallow.F90
102+
src/physics/cam/diffusion_solver.F90
103+
src/physics/cam/microp_driver.F90
104+
src/physics/cam/ndrop.F90
105+
src/physics/cam/phys_control.F90
106+
src/physics/cam/physpkg.F90
107+
src/physics/cam/pkg_cldoptics.F90
108+
src/physics/cam/vertical_diffusion.F90
109+
. remove dependecies on SPCAM_sam1mom and SPCAM_m2005
110+
111+
If there were any failures reported from running test_driver.sh on any test
112+
platform, and checkin with these failures has been OK'd by the gatekeeper,
113+
then copy the lines from the td.*.status files for the failed tests to the
114+
appropriate machine below. All failed tests must be justified.
115+
116+
derecho/intel/aux_cam:
117+
ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL)
118+
- pre-existing failures due to HEMCO not having reproducible results (issues #1018 and #856)
119+
120+
SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL)
121+
SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
122+
- pre-existing failures due to build-namelist error requiring CLM/CTSM external update
123+
124+
derecho/nvhpc/aux_cam: All PASS
125+
126+
izumi/nag/aux_cam: All PASS
127+
128+
izumi/gnu/aux_cam: All PASS
129+
130+
CAM tag used for the baseline comparison tests if different than previous
131+
tag:
132+
133+
Summarize any changes to answers: BFB
134+
135+
===============================================================
136+
===============================================================
137+
3138
Tag name: cam6_4_066
4139
Originator(s): fvitt
5140
Date: 14 Feb 2025

0 commit comments

Comments
 (0)