Skip to content

Commit 08d0326

Browse files
authored
Merge pull request #1010 from brian-eaton/cosp-vlim
cam6_4_005: Limit vertical domain used by COSP
2 parents 7507e72 + bffdd2e commit 08d0326

Some content is hidden

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

46 files changed

+1188
-15170
lines changed

doc/ChangeLog

+97
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,102 @@
11
===============================================================
22

3+
Tag name: cam6_4_005
4+
Originator(s): eaton
5+
Date: 1 July 2024
6+
One-line Summary: Limit vertical domain used by COSP.
7+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1010
8+
9+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
10+
11+
The COSP simulator was not working with "FMT" compsets. This compset has a
12+
model top of about 1 Pa which is above where the cloud parameterizations
13+
operate. The COSP interface routine was modified so that COSP operates on
14+
the same vertical domain as the cloud parameterizations which is set by
15+
the namelist variable trop_cloud_top_press (1 mb by default). Changing to
16+
a dynamically determined top required moving the call to COSP's
17+
initialization. In addition a lot of code cleanup was done, and a bug fix
18+
was made for the layer interface values of height and pressure passed from
19+
CAM to COSP.
20+
21+
. resolves #967- COSP prevents running "FMT" compsets.
22+
23+
Removed old tools for topo file generation.
24+
25+
. resolves #1005 - Remove old topo generation software from CAM
26+
27+
Describe any changes made to build system: none
28+
29+
Describe any changes made to the namelist: none
30+
31+
List any changes to the defaults for the boundary datasets: none
32+
33+
Describe any substantial timing or memory changes: not measured, but COSP
34+
should be less expensive in models with tops above 1 mb.
35+
36+
Code reviewed by: cacraig, nusbaume
37+
38+
List all files eliminated:
39+
tools/definehires/*
40+
tools/definesurf/*
41+
tools/topo_tool/*
42+
. these tools for topo file generation have been replaced by
43+
https://github.com/NCAR/Topo
44+
45+
List all files added and what they do: none
46+
47+
List all existing files that have been modified, and describe the changes:
48+
49+
src/control/cam_history_support.F90
50+
. fix log output format
51+
52+
src/physics/cam/cospsimulator_intr.F90
53+
. set top of data operated on by COSP using trop_cloud_top_lev
54+
. cospsimulator_intr_register
55+
- move the setcosp2values call here. That routine contains the call to
56+
COSP's initialization.
57+
. cospsimulator_intr_readnl
58+
- move the call to setcosp2values to cospsimulator_intr_register.
59+
. remove outdated and/or unhelpful comments
60+
. remove unused variables
61+
. remove added history fields that had no corresponding outfld calls
62+
. remove array section notation from places where the whole array is used
63+
64+
src/physics/cam/ref_pres.F90
65+
. add calls to create vertical coordinate variables for the domain bounded
66+
by trop_cloud_lev_top. Some COSP history fields need this coordinate.
67+
68+
src/utils/hycoef.F90
69+
. add comment and fix a comment
70+
71+
If there were any failures reported from running test_driver.sh on any test
72+
platform, and checkin with these failures has been OK'd by the gatekeeper,
73+
then copy the lines from the td.*.status files for the failed tests to the
74+
appropriate machine below. All failed tests must be justified.
75+
76+
derecho/intel/aux_cam: All PASS except:
77+
ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL)
78+
SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s (Overall: PEND)
79+
SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PEND)
80+
SMS_D_Ln9.T42_T42.FSCAM.derecho_intel.cam-outfrq9s (Overall: FAIL)
81+
SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h (Overall: DIFF)
82+
- pre-existing failures
83+
84+
izumi/nag/aux_cam: All PASS except:
85+
DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: PEND)
86+
- pre-existing failure
87+
88+
izumi/gnu/aux_cam: All PASS.
89+
90+
CAM tag used for the baseline comparison tests if different than previous
91+
tag:
92+
93+
Summarize any changes to answers: BFB. Note that although the regression
94+
tests with COSP diagnostics passed, there are some COSP diagnostic fields that
95+
have answer changes due to a bug fix in the data sent to COSP.
96+
97+
===============================================================
98+
===============================================================
99+
3100
Tag name: cam6_4_004
4101
Originator(s): fvitt
5102
Date: 29 Jun 2024

src/control/cam_history_support.F90

+3-3
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,7 @@ subroutine add_hist_coord_int(name, vlen, long_name, units, values, &
14071407
if (i == 0) then
14081408
call add_hist_coord(trim(name), i)
14091409
if(masterproc) then
1410-
write(iulog, '(3a,i0,a,i0)') 'Registering hist coord', trim(name), &
1410+
write(iulog, '(3a,i0,a,i0)') 'Registering hist coord: ', trim(name), &
14111411
'(', i, ') with length: ', vlen
14121412
end if
14131413
end if
@@ -1472,7 +1472,7 @@ subroutine add_hist_coord_r8(name, vlen, long_name, units, values, &
14721472
if (i == 0) then
14731473
call add_hist_coord(trim(name), i)
14741474
if(masterproc) then
1475-
write(iulog, '(3a,i0,a,i0)') 'Registering hist coord', trim(name), &
1475+
write(iulog, '(3a,i0,a,i0)') 'Registering hist coord: ', trim(name), &
14761476
'(', i, ') with length: ', vlen
14771477
end if
14781478
end if
@@ -1551,7 +1551,7 @@ subroutine add_vert_coord(name, vlen, long_name, units, values, &
15511551
vertical_coord=.true.)
15521552
i = get_hist_coord_index(trim(name))
15531553
if(masterproc) then
1554-
write(iulog, '(3a,i0,a,i0)') 'Registering hist coord', trim(name), &
1554+
write(iulog, '(3a,i0,a,i0)') 'Registering hist coord: ', trim(name), &
15551555
'(', i, ') with length: ', vlen
15561556
end if
15571557
end if

0 commit comments

Comments
 (0)