Merge pull request ESCOMP#22 from brian-eaton/rel_cosp

COSP updates (ESCOMP#17) for cam_cesm2_1_rel

Externals_CAM.cfg

@@ -23,7 +23,7 @@ required = True
 local_path = src/physics/cosp2/src
 protocol = svn
 repo_url = https://github.com/CFMIP/COSPv2.0/tags/
-tag = v2.0.3cesm/src
+tag = v2.1.4cesm/src
 required = True
 
 [externals_description]

bld/namelist_files/namelist_definition.xml

@@ -2346,38 +2346,6 @@ Default: FALSE
 
 <!-- COSP CFMIP Cloud Simulator LOGICALS -->
 
-<entry id="cosp_cfmip_3hr" type="logical"  category="cosp"
-       group="cospsimulator_nl" valid_values="">
-If true, the COSP cloud simulator is run for CFMIP 3-hourly
-experiments.
-This default logical is set in cospsimulator_intr.F90
-Default: FALSE
-</entry>
-
-<entry id="cosp_cfmip_da" type="logical"  category="cosp"
-       group="cospsimulator_nl" valid_values="">
-If true, the COSP cloud simulator is run for CFMIP daily
-experiments.
-This default logical is set in cospsimulator_intr.F90
-Default: FALSE
-</entry>
-
-<entry id="cosp_cfmip_off" type="logical"  category="cosp"
-       group="cospsimulator_nl" valid_values="">
-If true, the COSP cloud simulator is run for CFMIP off-line
-monthly experiments.
-This default logical is set in cospsimulator_intr.F90
-Default: FALSE
-</entry>
-
-<entry id="cosp_cfmip_mon" type="logical"  category="cosp"
-       group="cospsimulator_nl" valid_values="">
-If true, the COSP cloud simulator is run for CFMIP monthly
-experiments.
-This default logical is set in cospsimulator_intr.F90
-Default: FALSE
-</entry>
-
 <!-- COSP input control parameters -->
 
 <entry id="cosp_ncolumns" type="integer"  category="cosp"
@@ -2387,22 +2355,6 @@ This default logical is set in cospsimulator_intr.F90
 Default: 50
 </entry>
 
-<!-- COSP sampling parameters -->
-
-<entry id="cosp_sample_atrain" type="logical"  category="cosp"
-       group="cospsimulator_nl" valid_values="">
-Turns on sampling along a-train orbit for radar and lidar simulators.
-This default logical is set in cospsimulator_intr.F90
-Default: FALSE
-</entry>
-
-<entry id="cosp_atrainorbitdata" type="char*256"  category="cosp"
-       group="cospsimulator_nl" valid_values="">
-Full pathname for the Atrain orbit data file.
-cosp_atrainorbitdata is requiref if cosp_sample_atrain is TRUE.
-Default: NONE
-</entry>
-
 <!-- COSP output parameters -->
 
 <entry id="cosp_histfile_num" type="integer"  category="cosp"

doc/ChangeLog

@@ -1,5 +1,101 @@
 ===============================================================
 
+Tag name: cam_cesm2_1_rel_35
+Originator(s): kay, swales, eaton
+Date: Wed 16 Oct 2019 10:25:36 AM MDT
+One-line Summary: COSP2 updates
+
+Purpose of changes:
+
+. Fix bug for reversed vertical order in several outputs with cosp_ht
+  vertical coordinate (reported by Brian Medeiros).
+. Update to COSP tag v2.1.4cesm.  This is the same as v2.1.4 with a single
+  bugfix.
+. Add Cloudsat diagnostics
+
+Describe any changes made to build system: none
+
+Describe any changes made to the namelist:
+
+. removed:
+  cosp_cfmip_3hr
+  cosp_cfmip_da
+  cosp_cfmip_off
+  cosp_cfmip_mon
+  cosp_sample_atrain
+  cosp_atrainorbitdata
+
+List any changes to the defaults for the boundary datasets: none
+
+Describe any substantial timing or memory changes: not checked
+
+Code reviewed by: cacraig, nusbaume, goldy
+
+List all files eliminated: none
+
+List all files added and what they do: none
+
+List all existing files that have been modified, and describe the changes:
+
+Externals_CAM.cfg
+. update cosp2 external from v2.0.3cesm to v2.1.4cesm
+
+bld/namelist_files/namelist_definition.xml
+. remove variables:
+  cosp_cfmip_3hr
+  cosp_cfmip_da
+  cosp_cfmip_off
+  cosp_cfmip_mon
+  cosp_sample_atrain
+  cosp_atrainorbitdata
+
+src/physics/cam/cospsimulator_intr.F90
+. fix some comments
+  - 'lidar simulator' => 'calipso simulator'
+. updates for interface consistency w/ v2.1.4
+. remove namelist logicals that were removed from definition file
+. remove logic that used remove namelist vars
+  - some output variables that depended on namelist var settings now added
+    by default 
+. add cloudsat diagnostics (CS_*)
+. fix for reversed vertical order in several outputs with nht_cosp dimension
+
+src/physics/cosp2/Makefile.in
+. build updates for v2.1.4
+
+test/system/nl_files/outfrq3s_cosp
+. add CS_MIXCERT CS_MIXPOSS CS_NOPRECIP CS_PIA CS_RAINPOSS CS_RAINPROB to
+  fexcl1 
+
+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: PASS except:
+018 bl380 TBL.sh f1.9c6aqcdh outfrq3s_cosp 9s .................................................FAIL! rc= 7 at Tue Oct 15 15:06:55 MDT 2019
+
+cheyenne/intel/aux_cam: PASS
+
+hobart/nag: PASS except:
+024 bl317 TBL.sh f10c5aqcdm outfrq3s_cosp 9s ..................................................FAIL! rc= 7 at Tue Oct 15 15:31:31 MDT 2019
+027 bl318 TBL.sh f10c6aqcdm sat_hist 9s .......................................................FAIL! rc= 7 at Tue Oct 15 15:57:34 MDT 2019
+
+hobart/pgi: PASS
+
+The baseline failures are due to the bug fix which reverses the vertical
+order in some fields with the nht_cosp dimension.  These include the
+diagnostic fields CFAD_SR532_CAL CLD_CAL CLD_CAL_ICE CLD_CAL_LIQ CLD_CAL_UN
+
+CAM tag used for the baseline comparison tests if different than previous
+tag:
+
+Summarize any changes to answers: BFB except changes in COSP diagnostic
+fields notes above.
+
+===============================================================
+===============================================================
+
 Tag name: cam_cesm2_1_rel_34
 Originator(s): fvitt, dkin
 Date: 2 Oct 2019