Skip to content

Commit 87a5e98

Browse files
author
Steve Goldhaber
committed
updates
- Fix AMIP compsets - Remove CAM_AEROCOM - Fix use_aerocom values'
1 parent 9618e50 commit 87a5e98

6 files changed

Lines changed: 120 additions & 21 deletions

File tree

‎bld/build-namelist‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,8 @@ else {
969969
}
970970
}
971971

972-
# $aer_model is either 'bam' or 'mam'. This token is used in the element names that
972+
# $aer_model is one of 'bam', 'mam', or oslo.
973+
# This token is used in the element names that
973974
# are constructed to get the default physprops files.
974975
my $aer_model = 'bam';
975976
if ($prescribed_aero_model eq 'modal' or $chem =~ /_mam/) {$aer_model = 'mam';}
@@ -3288,7 +3289,7 @@ if ($simple_phys) {$use_simple_phys = '.true.';}
32883289
$nl->set_variable_value('phys_ctl_nl', 'use_simple_phys', $use_simple_phys);
32893290

32903291
#Cam-Oslo options
3291-
add_default($nl, 'use_aerocom');
3292+
add_default($nl, 'use_aerocom', 'ver'=>$aer_model);
32923293
add_default($nl, 'volc_fraction_coarse');
32933294
add_default($nl, 'aerotab_table_dir');
32943295
add_default($nl, 'ocean_filepath');

‎bld/namelist_files/namelist_defaults_cam.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4106,6 +4106,7 @@
41064106

41074107
<!-- CAM-Oslo variables -->
41084108
<use_aerocom>.false.</use_aerocom>
4109+
<use_aerocom ver="oslo">.true.</use_aerocom>
41094110
<dme_energy_adjust>.true.</dme_energy_adjust>
41104111
<volc_fraction_coarse >0.0</volc_fraction_coarse>
41114112
<aerotab_table_dir>noresm-only/atm/cam/camoslo/AeroTab_8jun17/</aerotab_table_dir>

‎bld/namelist_files/use_cases/1979-2021_camnor_lt_osloaero.xml‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
<?xml version="1.0"?>
2+
<namelist_defaults>
3+
4+
<!-- Solar data from NRL -->
5+
<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_irrad_data_file>
6+
7+
<!-- LBC Files -->
8+
<flbc_file>atm/waccm/lb/cmip7_ghg_version20260607/ghg_cmip7_CMIP_CR-CMIP-1-0-0_1750-2023_monthly_gnz_0p5degLat_version20260207.nc</flbc_file>
9+
<flbc_type>'SERIAL'</flbc_type>
10+
<flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>
11+
12+
<!-- Low top upper boundary conditions -->
13+
<ubc_specifier>'Q:H2O->UBC_FILE'</ubc_specifier>
14+
<ubc_file_path>atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc</ubc_file_path>
15+
<ubc_file_input_type>'SERIAL'</ubc_file_input_type>
16+
17+
<!-- ozone data -->
18+
<prescribed_ozone_datapath> 'atm/cam/ozone_strataero' </prescribed_ozone_datapath>
19+
<prescribed_ozone_file > 'ozone_strataero_WACCM_L70_zm5day_18500101-21010201_CMIP6histEnsAvg_SSP245_c190403.nc' </prescribed_ozone_file>
20+
<prescribed_ozone_name > 'O3' </prescribed_ozone_name>
21+
<prescribed_ozone_type > SERIAL </prescribed_ozone_type>
22+
23+
<!-- Prescribed oxidants for aerosol chemistry -->
24+
<tracer_cnst_datapath > 'atm/cam/tracer_cnst' </tracer_cnst_datapath>
25+
<tracer_cnst_file > 'tracer_cnst_halons_3D_L70_1849-2101_CMIP6ensAvg_SSP2-4.5_c190403.nc' </tracer_cnst_file>
26+
<tracer_cnst_specifier> 'O3','OH','NO3','HO2' </tracer_cnst_specifier>
27+
<tracer_cnst_type > INTERP_MISSING_MONTHS </tracer_cnst_type>
28+
<tracer_cnst_filelist > '' </tracer_cnst_filelist>
29+
30+
<!-- External forcing -->
31+
<ext_frc_type>INTERP_MISSING_MONTHS</ext_frc_type>
32+
<ext_frc_specifier hgrid="ne16np4" npg="3">
33+
'H2O -> $INPUTDATA_ROOT/atm/cam/chem/emis/elev/H2OemissionCH4oxidationx2_3D_L70_1849-2101_CMIP6ensAvg_SSP2-4.5_c190403.nc',
34+
'BC_AX -> 0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
35+
'BC_AX -> 0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
36+
'BC_N -> 0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
37+
'BC_N -> 0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
38+
'BC_NI -> $INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_bbALL_vertical_1849-2023_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
39+
'OM_NI -> 1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_airALL_vertical_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
40+
'OM_NI -> 1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_anthroprofALL_vertical_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
41+
'OM_NI -> 2.6*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_bbALL_vertical_1849-2023_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
42+
'SO2 -> 0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_airALL_vertical_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
43+
'SO2 -> 0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
44+
'SO2 -> 0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1849-2023_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
45+
'SO2 -> 0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1849-2023_ne16pg3_AeroCom2006_version20260209.nc',
46+
'SO4_PR -> 0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_airALL_vertical_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
47+
'SO4_PR -> 0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
48+
'SO4_PR -> 0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1849-2023_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
49+
'SO4_PR -> 0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1849-2023_ne16pg3_AeroCom2006_version20260209.nc'
50+
</ext_frc_specifier>
51+
52+
<ext_frc_specifier hgrid="ne30np4" npg="3">
53+
'H2O -> $INPUTDATA_ROOT/atm/cam/chem/emis/elev/H2OemissionCH4oxidationx2_3D_L70_1849-2101_CMIP6ensAvg_SSP2-4.5_c190403.nc',
54+
'BC_AX -> 0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
55+
'BC_AX -> 0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
56+
'BC_N -> 0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
57+
'BC_N -> 0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
58+
'BC_NI -> $INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_bbALL_vertical_1849-2023_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
59+
'OM_NI -> 1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_airALL_vertical_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
60+
'OM_NI -> 1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_anthroprofALL_vertical_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
61+
'OM_NI -> 2.6*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_bbALL_vertical_1849-2023_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
62+
'SO2 -> 0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_airALL_vertical_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
63+
'SO2 -> 0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
64+
'SO2 -> 0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1849-2023_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
65+
'SO2 -> 0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1849-2023_ne30pg3_AeroCom2006_version20260209.nc',
66+
'SO4_PR -> 0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_airALL_vertical_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
67+
'SO4_PR -> 0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
68+
'SO4_PR -> 0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1849-2023_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
69+
'SO4_PR -> 0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1849-2023_ne30pg3_AeroCom2006_version20260209.nc'
70+
</ext_frc_specifier>
71+
72+
73+
74+
<!-- Surface emissions -->
75+
<srf_emis_type>INTERP_MISSING_MONTHS</srf_emis_type>
76+
<srf_emis_specifier hgrid="ne16np4" npg="3">
77+
'BC_AX -> 0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
78+
'BC_N -> 0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
79+
'OM_NI -> 1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_anthrosurfALL_surface_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
80+
'SO2 -> 0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
81+
'SO4_PR -> 0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1849-2023_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc'
82+
</srf_emis_specifier>
83+
84+
<srf_emis_specifier hgrid="ne30np4" npg="3">
85+
'BC_AX -> 0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
86+
'BC_N -> 0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
87+
'OM_NI -> 1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_anthrosurfALL_surface_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
88+
'SO2 -> 0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
89+
'SO4_PR -> 0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1849-2023_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc'
90+
</srf_emis_specifier>
91+
92+
<csw_time_type>SERIAL</csw_time_type>
93+
94+
<rad_climate>'A:Q:H2O','N:O2:O2','N:CO2:CO2','N:ozone:O3','N:N2O:N2O','N:CH4:CH4','N:CFC11:CFC11','N:CFC12:CFC12'</rad_climate>
95+
96+
<!--Options for megan -->
97+
<megan_specifier>'isoprene = isoprene','monoterp = myrcene + sabinene + limonene+ carene_3 + ocimene_t_b + pinene_b + pinene_a'</megan_specifier>
98+
99+
<prescribed_volcaero_datapath>atm/cam/volc/cmip7_volcaod_v20260105</prescribed_volcaero_datapath>
100+
<prescribed_volcaero_file>UOEXETER-CMIP-2-2-1_175001-202312_intpwghtavg_v20260105.nc</prescribed_volcaero_file>
101+
102+
<!-- for prescribed deposition and emission fluxes -->
103+
<sim_year>1979-2021</sim_year>
104+
105+
</namelist_defaults>

‎cime_config/config_component.xml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
CAM
99
===============
1010
-->
11-
<desc atm="CAM70[%LT][%MT][%WA][%WX][%CSO][%CT1S][%CT4S][%CT0MA][%CT1MA][%CT4MA][%NORESM][%TROPMAM4][%CAMoslo][%GHGCAMoslo][%AMIP]" >CAM cam7 physics:</desc>
11+
<desc atm="CAM70[%LT][%MT][%WA][%WX][%CSO][%CT1S][%CT4S][%CT0MA][%CT1MA][%CT4MA][%NORESM][%TROPMAM4][%CAMoslo][%GHGCAMoslo]" >CAM cam7 physics:</desc>
1212
<desc atm="CAM60[%1PCT][%4xCO2][%CARMATS][%CARMAWM][%CT1S][%CT2S][%CFIRE][%CVBSX][%NUDG][%PORT][%RCO2][%SCAM][%SDYN][%WCCM][%WCMD][%WCSC][%WCTS][%WXIE][%WXIED][%HEMCO][%GEOSCHEM][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam6 physics:</desc>
1313
<desc atm="CAM50[%CT1S][%CLB][%PORT][%RCO2][%MAM7][%SCAM][%SDYN][%WCSC][%WCTS][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam5 physics:</desc>
1414
<desc atm="CAM40[%PORT][%RCO2][%SCAM][%SDYN][%TMOZ][%WX][%WXIE][%WXIED][%WCCM][%WCMD][%SCAMARM95][%SCAMARM97][%SCAMATEX][%SCAMBOMEX][%SCAMCGILSS11][%SCAMCGILSS12][%SCAMCGILSS6][%SCAMDYCOMSRF01][%SCAMDYCOMSRF02][%SCAMGATE3][%SCAMMPACE][%SCAMRICO][%SCAMSPARTICUS][%SCAMTOGA2][%SCAMTWP06][%SCAMCAMFRC]" >CAM cam4 physics:</desc>
@@ -359,6 +359,8 @@
359359
<value compset="HIST_CAM70%LT%NORESM%CAMoslo" >hist_camnor_lt_osloaero</value>
360360
<value compset="2000_CAM70%LT%NORESM%TROPMAM4" >2000_camnor_tropmam4</value>
361361
<value compset="2000_CAM70%LT%NORESM%CAMoslo" >2000_camnor_osloaero</value>
362+
<value compset="AMIP_CAM70%LT%NORESM%CAMoslo" >1979-2021_camnor_lt_osloaero</value>
363+
362364
<!-- SCAM defaults to ARM97, all other IOPs are in usermods_dirs -->
363365
<!-- <value compset="CAM[456]0%SCAM" >scam_arm97</value> -->
364366
</values>
@@ -431,14 +433,6 @@
431433
<desc>CAM CO2 manipulation experiment (if any)</desc>
432434
</entry>
433435

434-
<entry id="CAM_AEROCOM">
435-
<type>logical</type>
436-
<default_value>FALSE</default_value>
437-
<group>build_component_cam</group>
438-
<file>env_build.xml</file>
439-
<desc>If true, turn on aerocom diagnostics for oslo-aerosol package</desc>
440-
</entry>
441-
442436
<entry id="CAM_USER_MODS">
443437
<type>char</type>
444438
<valid_values></valid_values>

‎cime_config/config_compsets.xml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@
6060
<lname>1850_CAM70%LT%NORESM%GHGCAMoslo_CLM60%FATES-NOCOMP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
6161
</compset>
6262

63-
<compset>
64-
<alias>NF1850amip</alias>
65-
<lname>1850_CAM70%LT%NORESM%CAMoslo%AMIP_CLM60%FATES-NOCOMP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
66-
</compset>
67-
6863
<!-- CAM7 HIST -->
6964

7065
<compset>
@@ -82,11 +77,6 @@
8277
<lname>HIST_CAM70%LT%NORESM%GHGCAMoslo_CLM60%FATES-NOCOMP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
8378
</compset>
8479

85-
<compset>
86-
<alias>NFHISTamip</alias>
87-
<lname>HIST_CAM70%LT%NORESM%CAMoslo%AMIP_CLM60%FATES-NOCOMP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
88-
</compset>
89-
9080
<!-- CAM7 2000 -->
9181

9282
<compset>
@@ -104,6 +94,13 @@
10494
<lname>2000_CAM70%LT%NORESM%GHGCAMoslo_CLM60%FATES-NOCOMP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
10595
</compset>
10696

97+
<!-- CAM7 AMIP -->
98+
99+
<compset>
100+
<alias>NFAMIP</alias>
101+
<lname>AMIP_CAM70%LT%NORESM%CAMoslo_CLM60%FATES-NOCOMP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
102+
</compset>
103+
107104
<!-- ********************************* -->
108105
<!-- Hybrid NorESM / CAM-chem compsets -->
109106
<!-- ********************************* -->

‎cime_config/testdefs/testmods_dirs/cam/outfrq6h_aero_history/user_nl_cam‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ history_aerosol_forcing = .true.
1111
history_aerosol_radiation = .true.
1212
history_aerosol_debug_output = .true.
1313
history_gas = .true.
14+
use_aerocom = .true.
1415
fincl3 = 'IntHeatTr:I', 'PotEnerTr:I', 'LatHeatTr:I', 'KinEnerTr:I', 'TotEnerTr:I'

0 commit comments

Comments
 (0)