Skip to content

Commit cf8e1c4

Browse files
gold2718gold2718
authored
Merge pull request #232 from Johannesfjeldsaa/cam_output_control_noresm3_beta01
Summary: Control all output from CAM-Oslo Contributors: Johannes Fjeldså Reviewers: Steve Goldhaber Purpose of changes: Contain output from CAM-Oslo that is always outputted to be namelist options. Changes in CAM will allow for changes in OsloAero to take place. Github PR URL: #232 Changes made to build system: 'None' Changes made to the namelist: build-namelist, namelist_definitions and namelist_defaults_cam has six new namelist flags. Changes to the defaults for the boundary datasets: 'None' Substantial timing or memory changes: 'None' Introduce six new history flags to contain output that is always outputted from OsloAero. Similar work as done for noresm2.3 (see #198 (comment)). In addition these flags will govern summation fields aggregated by OsloAero as opposed to performing this aggregation in diagnostics or post processing. Should remain a draft PR until NorESMhub/OSLO_AERO#60 is merged. fixes: #195 Testing: aux_cam_noresm Expected fails due to: #180 NorESMhub/NorESM#695
2 parents 1cda40b + ddbc5b4 commit cf8e1c4

11 files changed

Lines changed: 131 additions & 17 deletions

File tree

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
[submodule "oslo_aero"]
7878
path = src/chemistry/oslo_aero
7979
url = https://github.com/NorESMhub/OSLO_AERO
80-
fxtag = oslo_aero_3_0a005
80+
fxtag = oslo_aero_3_0a006
8181
fxrequired = AlwaysRequired
8282
fxDONOTUSEurl = https://github.com/NorESMhub/OSLO_AERO.git
8383

‎bld/build-namelist‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4537,6 +4537,12 @@ add_default($nl, 'history_chemistry');
45374537
add_default($nl, 'history_chemspecies_srf');
45384538
add_default($nl, 'history_clubb');
45394539
add_default($nl, 'history_dust');
4540+
add_default($nl, 'history_aerosol_base');
4541+
add_default($nl, 'history_aerosol_decomposed');
4542+
add_default($nl, 'history_gas');
4543+
add_default($nl, 'history_aerosol_forcing');
4544+
add_default($nl, 'history_aerosol_radiation');
4545+
add_default($nl, 'history_aerosol_debug_output');
45404546

45414547
# The history output for the AMWG variability diagnostics assumes that auxilliary history
45424548
# files h1, h2, and h3 contain daily, 6-hrly, and 3-hrly output respectively. If this output

‎bld/namelist_files/namelist_defaults_cam.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2978,6 +2978,12 @@ See https://github.com/NorESMhub/noresm3_dev_simulations/discussions/78
29782978
<history_chemspecies_srf> .true. </history_chemspecies_srf>
29792979
<history_clubb> .true. </history_clubb>
29802980
<history_dust> .false. </history_dust>
2981+
<history_aerosol_base> .true. </history_aerosol_base>
2982+
<history_aerosol_decomposed> .false. </history_aerosol_decomposed>
2983+
<history_gas> .false. </history_gas>
2984+
<history_aerosol_forcing> .false. </history_aerosol_forcing>
2985+
<history_aerosol_radiation> .false. </history_aerosol_radiation>
2986+
<history_aerosol_debug_output> .false. </history_aerosol_debug_output>
29812987

29822988
<cam_snapshot_before_num> -1 </cam_snapshot_before_num>
29832989
<cam_snapshot_after_num> -1 </cam_snapshot_after_num>

‎bld/namelist_files/namelist_definition.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5734,6 +5734,47 @@ Switch to turn on/off default output chemical species mixing ratios in the surfa
57345734
Default: .false.
57355735
</entry>
57365736

5737+
<entry id="history_aerosol_base" type="logical" category="diagnostics"
5738+
group="phys_ctl_nl" valid_values="" >
5739+
Switch to turn on/off output of; mass mixing ratios and column burdens for compounded aerosols (BC, DUST, OM, SALT, SULFATE)
5740+
and gas-phase column burdens from OsloAero; summation fields for emission/source, wet and dry deposition.
5741+
Also controls output of other key aerosol-specific output fields.
5742+
Default: .true.
5743+
</entry>
5744+
5745+
<entry id="history_aerosol_decomposed" type="logical" category="diagnostics"
5746+
group="phys_ctl_nl" valid_values="" >
5747+
Switch to turn on/off output of decomposed aerosols from OsloAero.
5748+
Default: .false.
5749+
</entry>
5750+
5751+
<entry id="history_gas" type="logical" category="diagnostics"
5752+
group="phys_ctl_nl" valid_values="" >
5753+
Switch to turn on/off output of 3D gasphase aerosols from OsloAero.
5754+
NOTE; the 2D column burdens are triggered by history_aerosol_base.
5755+
Default: .false.
5756+
</entry>
5757+
5758+
<entry id="history_aerosol_forcing" type="logical" category="diagnostics"
5759+
group="phys_ctl_nl" valid_values="" >
5760+
Switch to turn on/off output of forcing specific species in OsloAero.
5761+
Default: .false.
5762+
</entry>
5763+
5764+
<entry id="history_aerosol_radiation" type="logical" category="diagnostics"
5765+
group="phys_ctl_nl" valid_values="" >
5766+
Switch to turn on/off output of aerosol radiative properties.
5767+
Default: .false.
5768+
</entry>
5769+
5770+
<entry id="history_aerosol_debug_output" type="logical" category="diagnostics"
5771+
group="phys_ctl_nl" valid_values="" >
5772+
Switch to turn on/off output for debugging summation from OsloAero. Some summation fields are compounded of variables passed through
5773+
the physics buffer. This flag provides the lagged output of these variables. Also controls summations used across multiple
5774+
summation fields.
5775+
Default: .false.
5776+
</entry>
5777+
57375778
<entry id="offline_driver" type="logical" category="offline_unit_driver"
57385779
group="phys_ctl_nl" valid_values="" >
57395780
True when model is configured to use an offline driver.

‎cime_config/testdefs/ExpectedTestFails.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@
3030

3131
<!-- aux_cam_noresm test suite failures -->
3232

33+
<test name="ERP_Ln9.ne30pg3_ne30pg3_mtn14.NF1850.betzy_intel.cam-outfrq9s_aero_history">
34+
<phase name="COMPARE_base_rest">
35+
<status>FAIL</status>
36+
<issue>NorESMhub/CAM#180</issue>
37+
</phase>
38+
</test>
39+
3340
<test name="ERP_Ln9.ne16pg3_ne16pg3_mtn14.NF1850ghg_fates-nocomp.betzy_intel.cam-outfrq9s">
3441
<phase name="COMPARE_base_rest">
3542
<status>FAIL</status>

‎cime_config/testdefs/testlist_cam.xml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,41 @@
2727
</options>
2828
</test>
2929

30-
<test compset="NF2000" grid="ne30pg3_ne30pg3_mtn14" name="SMS_D_Ln9" testmods="cam/outfrq9s">
30+
<test compset="NF2000" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
3131
<machines>
3232
<machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
3333
</machines>
3434
<options>
3535
<option name="wallclock">00:30:00</option>
3636
</options>
3737
</test>
38-
<test compset="NF2000" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
38+
<test compset="NF2000mam4" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
3939
<machines>
4040
<machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
4141
</machines>
4242
<options>
4343
<option name="wallclock">00:30:00</option>
4444
</options>
4545
</test>
46-
<test compset="NF2000mam4" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
46+
47+
<test compset="NF1850fates-sp" grid="ne16pg3_ne16pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
4748
<machines>
4849
<machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
4950
</machines>
5051
<options>
51-
<option name="wallclock">00:30:00</option>
52+
<option name="wallclock">00:20:00</option>
5253
</options>
5354
</test>
5455

55-
<test compset="NF1850fates-sp" grid="ne16pg3_ne16pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
56+
<test compset="NF1850" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
5657
<machines>
5758
<machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
5859
</machines>
5960
<options>
6061
<option name="wallclock">00:20:00</option>
6162
</options>
6263
</test>
63-
64-
<test compset="NF1850" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
64+
<test compset="NF1850" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s_aero_history">
6565
<machines>
6666
<machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
6767
</machines>
@@ -103,21 +103,20 @@
103103
</options>
104104
</test>
105105

106-
<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
107-
<!-- CAM test-supported COMPSETS -->
108-
<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
109-
110-
<test compset="F1850" grid="f19_f19_mtn14" name="ERP_D_Ln9_P256" testmods="cam/outfrq9s">
106+
<test compset="NF1850" grid="ne3pg3_ne3pg3_mtn14" name="ERP_D_Ln9" testmods="cam/outfrq9s">
111107
<machines>
112108
<machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
113-
<machine name="betzy" compiler="intel" category="prealpha_noresm"/>
114109
</machines>
115110
<options>
116111
<option name="wallclock">00:20:00</option>
117112
</options>
118113
</test>
119114

120-
<test compset="F2000climo" grid="ne30pg3_ne30pg3_mtn14" name="SMS_D_Ln9_P256" testmods="cam/outfrq9s">
115+
<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
116+
<!-- CAM test-supported COMPSETS -->
117+
<!-- @@@@@@@@@@@@@@@@@@@@@@@@@@@ -->
118+
119+
<test compset="F1850" grid="f19_f19_mtn14" name="ERP_D_Ln9_P256" testmods="cam/outfrq9s">
121120
<machines>
122121
<machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
123122
<machine name="betzy" compiler="intel" category="prealpha_noresm"/>

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_aero_history/shell_commands‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
./xmlchange ROF_NCPL=\$ATM_NCPL
2+
./xmlchange GLC_NCPL=\$ATM_NCPL

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_aero_history/user_nl_cam‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
mfilt=1,1,1,1,1,1
2+
ndens=1,1,1,1,1,1
3+
nhtfrq=9,9,9,9,9,9
4+
write_nstep0=.true.
5+
inithist='ENDOFRUN'
6+
history_chemspecies_srf = .true.
7+
history_aerosol = .true.
8+
history_aerosol_base = .true.
9+
history_aerosol_decomposed = .true.
10+
history_aerosol_forcing = .true.
11+
history_aerosol_radiation = .true.
12+
history_aerosol_debug_output = .true.
13+
history_gas = .true.

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_aero_history/user_nl_clm‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
!----------------------------------------------------------------------------------
2+
! Users should add all user specific namelist changes below in the form of
3+
! namelist_var = new_namelist_value
4+
!
5+
! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
6+
! are set in the CLM_NAMELIST_OPTS env variable.
7+
!
8+
! EXCEPTIONS:
9+
! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
10+
! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
11+
! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
12+
! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
13+
! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
14+
! Set irrigate by the CLM_BLDNML_OPTS -irrig setting
15+
! Set dtime with L_NCPL option
16+
! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
17+
! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
18+
! (includes $inst_string for multi-ensemble cases)
19+
! Set glc_grid with CISM_GRID option
20+
! Set glc_smb with GLC_SMB option
21+
! Set maxpatch_glcmec with GLC_NEC option
22+
! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
23+
!----------------------------------------------------------------------------------
24+
hist_nhtfrq = 9
25+
hist_mfilt = 1
26+
hist_ndens = 1
27+

‎src/chemistry/oslo_aero‎

0 commit comments

Comments
 (0)