Skip to content

Commit

Permalink
Merge pull request ESCOMP#192 from fvitt/fxhist_ic
Browse files Browse the repository at this point in the history 
cam6_2_044: provide IC files for FXHIST compset
  • Loading branch information
@fvitt
fvitt authored Aug 26, 2020
2 parents 89f402d + d03a3d3 commit b9170f7
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 22 deletions.
44 changes: 24 additions & 20 deletions bld/namelist_files/use_cases/waccmx_ma_hist_cam6.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

<namelist_defaults>

<!-- ICs -->
<ncdata dyn="fv" hgrid="1.9x2.5" >atm/waccm/ic/f.e22.FXHIST.f19_f19_mg17_test.001.cam.i.1979-01-01-00000_c200816.nc</ncdata>
<ncdata dyn="fv" hgrid="0.9x1.25">atm/waccm/ic/f.e22.FXHIST.f09_f09_mg17_test.001.cam.i.1979-01-01-00000_c200820.nc</ncdata>

<!-- Solar data -->
<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
<solar_parms_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_parms_data_file>
Expand Down Expand Up @@ -42,15 +46,15 @@
<nhtfrq hgrid="1.9x2.5">0, -1, -24, -24, -120, -24, -24 </nhtfrq>
<mfilt hgrid="1.9x2.5">1, 24, 7, 7, 10, 1, 365 </mfilt>

<!-- Monthly -->
<fincl1>
<!-- Monthly -->
<fincl1>
'Z3', 'T', 'TIon', 'TElec', 'e', 'U', 'V', 'OMEGA', 'UI', 'VI',
'WI', 'ElecColDens', 'PHIM2D', 'PS', 'EDYN_ZIGM11_PED', 'EDYN_ZIGM2_HAL', 'ED1', 'ED2', 'O', 'O2',
'H', 'NO', 'CO2', 'N', 'O1D', 'Op2P', 'Op2D', 'Op', 'Np', 'N2p',
'O2p', 'NOp', 'QJOULE', 'SIGMAHAL', 'SIGMAPED', 'SolIonRate_Tot', 'QRS_TOT', 'QO3', 'QCO2', 'QNO',
'QO3P', 'QHC2S', 'QJOULE', 'QEN', 'QIN', 'QEI', 'EKGW', 'TTGW', 'UTGW_TOTAL', 'T_24_COS',
'T_24_SIN', 'T_12_COS', 'T_12_SIN', 'T_08_COS', 'T_08_SIN', 'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'U_08_COS',
'U_08_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'V_08_COS', 'V_08_SIN',
'U_08_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'V_08_COS', 'V_08_SIN',
'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS',
'OMEGA_12_SIN', 'OMEGA_08_COS', 'OMEGA_08_SIN', 'ALATM', 'ALONM', 'AOA1', 'AOA2', 'BR', 'BRCL', 'BRO',
'BRONO2', 'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH2O', 'CH3BR', 'CH3CCL3',
Expand All @@ -68,35 +72,35 @@
'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'KVH',
'KVM', 'KVT', 'Qbkgndtot', 'Z3GM', 'OpDens', 'EDens'
</fincl1>
<!-- Instantaneous -->
<fincl2>
'Z3', 'T', 'TIon', 'TElec', 'e', 'U', 'V', 'OMEGA', 'UI', 'VI', 'WI', 'ElecColDens', 'PHIM2D', 'PS',
<!-- Instantaneous -->
<fincl2>
'Z3', 'T', 'TIon', 'TElec', 'e', 'U', 'V', 'OMEGA', 'UI', 'VI', 'WI', 'ElecColDens', 'PHIM2D', 'PS',
'EDYN_ZIGM11_PED', 'EDYN_ZIGM2_HAL', 'ED1', 'ED2', 'O', 'O2', 'H'
</fincl2>
<!-- Instantaneous -->
<fincl3>
'Z3', 'T', 'TIon', 'TElec', 'e', 'U', 'V', 'OMEGA', 'UI', 'VI', 'WI', 'ElecColDens', 'PHIM2D', 'PS',
'EDYN_ZIGM11_PED', 'EDYN_ZIGM2_HAL', 'ED1', 'ED2', 'O', 'O2', 'H', 'NO', 'CO2', 'N', 'O1D',
<!-- Instantaneous -->
<fincl3>
'Z3', 'T', 'TIon', 'TElec', 'e', 'U', 'V', 'OMEGA', 'UI', 'VI', 'WI', 'ElecColDens', 'PHIM2D', 'PS',
'EDYN_ZIGM11_PED', 'EDYN_ZIGM2_HAL', 'ED1', 'ED2', 'O', 'O2', 'H', 'NO', 'CO2', 'N', 'O1D',
'Op2P', 'Op2D', 'Op', 'Np', 'N2p', 'O2p', 'NOp', 'QJOULE', 'SIGMAHAL', 'SIGMAPED', 'SolIonRate_Tot',
'Z3GM', 'OpDens', 'EDens'
</fincl3>
<!-- Average every 5 days -->
<fincl4>
'Z3', 'T', 'TIon', 'TElec', 'e', 'U', 'V', 'OMEGA', 'UI', 'VI', 'WI', 'ElecColDens', 'PHIM2D', 'PS',
'EDYN_ZIGM11_PED', 'EDYN_ZIGM2_HAL', 'ED1', 'ED2', 'O', 'O2', 'H', 'NO', 'CO2', 'N', 'QRS_TOT',
'QO3', 'QCO2', 'QNO', 'QO3P', 'QHC2S', 'QJOULE', 'EKGW', 'TTGW', 'UTGW_TOTAL',
<!-- Average every 5 days -->
<fincl4>
'Z3', 'T', 'TIon', 'TElec', 'e', 'U', 'V', 'OMEGA', 'UI', 'VI', 'WI', 'ElecColDens', 'PHIM2D', 'PS',
'EDYN_ZIGM11_PED', 'EDYN_ZIGM2_HAL', 'ED1', 'ED2', 'O', 'O2', 'H', 'NO', 'CO2', 'N', 'QRS_TOT',
'QO3', 'QCO2', 'QNO', 'QO3P', 'QHC2S', 'QJOULE', 'EKGW', 'TTGW', 'UTGW_TOTAL',
'SolIonRate_Tot', 'Z3GM', 'OpDens', 'EDens'
</fincl4>
<!-- Average every 5 days -->
<fincl5>
<!-- Average every 5 days -->
<fincl5>
'T_24_COS', 'T_24_SIN', 'T_12_COS', 'T_12_SIN', 'T_08_COS', 'T_08_SIN',
'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'U_08_COS', 'U_08_SIN',
'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'V_08_COS', 'V_08_SIN',
'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'OMEGA_08_COS', 'OMEGA_08_SIN'
</fincl5>
<!-- Average every day -->
<fincl7>
'MSKtem', 'PS', 'PSL', 'VTHzm', 'UVzm', 'UWzm', 'Uzm', 'Vzm', 'THzm','Wzm', 'PHIS'
<!-- Average every day -->
<fincl7>
'MSKtem', 'PS', 'PSL', 'VTHzm', 'UVzm', 'UWzm', 'Uzm', 'Vzm', 'THzm','Wzm', 'PHIS'
</fincl7>

<fv_div24del2flag>42</fv_div24del2flag>
Expand Down
55 changes: 53 additions & 2 deletions doc/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,56 @@
===============================================================

Tag name: cam6_2_044
Originator(s): fvitt, joemci
Date: 25 Aug 2020
One-line Summary: Provide appropriate IC files for FXHIST compset
Github PR URL: https://github.com/ESCOMP/CAM/pull/192

Purpose of changes (include the issue number and title text for each relevant GitHub issue):

This provides appropriate IC files for FXHIST for FV 1.9x2.5 and 0.9x1.25 grids with
start date of 1979-01-01.
Issue: Mismatch of start date and 1 degree and 2 degree initial files for FXHIST compset #191

Describe any changes made to build system:

Describe any changes made to the namelist:

List any changes to the defaults for the boundary datasets:

Describe any substantial timing or memory changes:

Code reviewed by: CAM code review team

List all files eliminated:

List all files added and what they do:

List all existing files that have been modified, and describe the changes:

M bld/namelist_files/use_cases/waccmx_ma_hist_cam6.xml
- set ncdata for FV 1.9x2.5 and 0.9x1.25 grids

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/aux_cam:
SMS_D_Ln9.f19_f19_mg17.FXHIST.cheyenne_intel.cam-outfrq9s_amie (Overall: DIFF) details:
FAIL SMS_D_Ln9.f19_f19_mg17.FXHIST.cheyenne_intel.cam-outfrq9s_amie NLCOMP
FAIL SMS_D_Ln9.f19_f19_mg17.FXHIST.cheyenne_intel.cam-outfrq9s_amie BASELINE /glade/p/cesm/amwg/cesm_baselines/cam6_2_043: DIFF
- expected failure due to change in initial conditions

izumi/nag/aux_cam: All PASS

izumi/pgi/aux_cam: All PASS

Summarize any changes to answers: bit-for-bit unchanged (except FXHIST)

===============================================================
===============================================================

Tag name: cam6_2_043
Originator(s): eaton
Date: Wed 19 Aug 2020 03:59:44 PM MDT
Expand Down Expand Up @@ -40,7 +91,7 @@ src/dynamics/tests/initial_conditions/ic_us_standard_atm.F90
. us_std_atm_set_ic
- add optional arg PHIS_OUT to allow setting PHIS when not using a topo
file.

src/dynamics/tests/inic_analytic.F90
. dyn_set_inic_col
- add PHIS_OUT to calling args for us_std_atm_set_ic
Expand Down Expand Up @@ -797,7 +848,7 @@ M Externals.cfg
- update externals
M cime_config/config_component.xml
- SCAM fix for new CCTS rename to CCTS1 and CCTS2
- SCAM bug fix. Remove ARM97 usercase default. Overwriting defaults for all scam cases.
- SCAM bug fix. Remove ARM97 usercase default. Overwriting defaults for all scam cases.
M cime_config/config_compsets.xml
- new SCAM SAS IOP compset definition
M src/dynamics/eul/iop.F90
Expand Down

0 comments on commit b9170f7

Please sign in to comment.