Skip to content

cam6_4_053: Update CARMA external base #1201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 7, 2025
Merged

cam6_4_053: Update CARMA external base #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0624476
changes to use carma4_09 base
fvitt Dec 4, 2024
398d956
set carma_sulfnuc_method namelist option
fvitt Dec 4, 2024
ea7b248
change derecho 10x15 res tests to 4x5
fvitt Dec 5, 2024
189151b
code review changes
fvitt Jan 3, 2025
f43794b
Merge remote-tracking branch 'ESCOMP/cam_development' into carma_base…
fvitt Jan 6, 2025
76ea3a4
update ChangeLog
fvitt Jan 7, 2025
56ccdb0
update ChangeLog
fvitt Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
path = src/physics/carma/base
url = https://github.com/ESCOMP/CARMA_base.git
fxrequired = AlwaysRequired
fxtag = carma4_01
fxtag = carma4_09
fxDONOTUSEurl = https://github.com/ESCOMP/CARMA_base.git

[submodule "pumas"]
Expand Down
3 changes: 2 additions & 1 deletion bld/build-namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,7 @@ if ($carma ne 'none') {
add_default($nl, 'carma_model', 'val'=>$carma);
add_default($nl, 'carma_flag', 'val'=>'.true.');
add_default($nl, 'history_carma', 'val'=>'.true.');
add_default($nl, 'carma_sulfnuc_method','val'=>'ZhaoTurco');
}
if ($carma eq 'bc_strat') {
add_default($nl, 'carma_do_drydep', 'val'=>'.true.');
Expand Down Expand Up @@ -1587,7 +1588,7 @@ if (defined $nl->get_value('prescribed_strataero_3modes')) {

# determine if prescribed stratospheric aerosol data is needed
if ( ($het_chem) || ($nl->get_value('prescribed_strataero_feedback') =~ /$TRUE/io ) ){
if ( ($carma ne 'sulfate') && !($nl->get_value('modal_strat_sulfate') =~ /$TRUE/io) ) { # if no prognostic stratospheric aerosols
if ( !($nl->get_value('modal_strat_sulfate') =~ /$TRUE/io) ) { # if no prognostic stratospheric aerosols

unless (defined $nl->get_value('prescribed_strataero_type')) {
add_default($nl, 'prescribed_strataero_type','val'=>'CYCLICAL');
Expand Down
17 changes: 17 additions & 0 deletions bld/namelist_files/namelist_definition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4476,6 +4476,23 @@ is not active.
Default: none
</entry>

<entry id="carma_sulfnuc_method" type="char*10" category="carma"
group="carma_nl" valid_values="ZhaoTurco,Vehkamaki" >
Nucleation methods:
ZhaoTurco
Zhao, J. and Turco, R.,
Nucleation simulations in the wake of a jet aircraft in stratospheric flight,
J. Aerosol Sci., 26, 779-795, 1995,
https://doi.org/10.1016/0021-8502(95)00010-A
Vehkamaki
Vehkamaki, H., M. Kulmala, I. Napari, K.E.J. Lehtinen,
C. Timmreck, M. Noppel and A. Laaksonen, 2002,
An improved parameterization for sulfuric acid-water nucleation
rates for tropospheric and stratospheric conditions,
J. Geophys. Res., 107, 4622, doi:10.1029/2002jd002184
Default: none
</entry>

<entry id="carma_conmax" type="real" category="carma"
group="carma_nl" valid_values="" >
A fraction that scales how tight the convergence criteria are to
Expand Down
120 changes: 113 additions & 7 deletions cime_config/testdefs/testlist_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,15 @@
<test compset="F2000climo" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_dust">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="izumi" compiler="gnu" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA dust test</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="F2000climo" grid="f19_f19_mg17" name="ERS_D_Ln9" testmods="cam/carma_dust">
<machines>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -602,7 +611,16 @@
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_sea_salt">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="izumi" compiler="gnu" category="carma"/>
<machine name="izumi" compiler="nag" category="aux_cam"/>
</machines>
<options>
<option name="comment" >CARMA sea salt test</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_sea_salt">
<machines>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -614,7 +632,15 @@
<test compset="QPWmaC6" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_meteor_smoke">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA test of aerosol from meteor smoke</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPWmaC6" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_meteor_smoke">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA test of aerosol from meteor smoke</option>
Expand All @@ -625,6 +651,15 @@
<test compset="QPWmaC6" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_meteor_impact">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="izumi" compiler="gnu" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA test of aerosols from meteor impact</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPWmaC6" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_meteor_impact">
<machines>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -636,6 +671,15 @@
<test compset="QPWmaC6" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_pmc">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="izumi" compiler="gnu" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA Test of Polar Mesospheric Clouds (pmc)</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPWmaC6" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_pmc">
<machines>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -647,6 +691,14 @@
<test compset="QPC5" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_radiative">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA radiation test</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPC5" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_radiative">
<machines>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -655,9 +707,17 @@
</options>
</test>
<!-- carma test_tracers -->
<test compset="QPC5" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_tracers">
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA tracers test</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers">
<machines>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -669,6 +729,14 @@
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers2">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA tracers2 test</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers2">
<machines>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -680,6 +748,14 @@
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_passive">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA passive test</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_passive">
<machines>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -691,6 +767,15 @@
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_swelling">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="izumi" compiler="gnu" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA particle swelling test</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_swelling">
<machines>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand Down Expand Up @@ -738,6 +823,14 @@
<test compset="FW4ma2000" grid="f10_f10_mg37" name="SMS_D_Ln9" testmods="cam/carma_sulfate">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA pure sulfate test</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="FW4ma2000" grid="f45_f45_mg37" name="SMS_D_Ln9" testmods="cam/carma_sulfate">
<machines>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -749,6 +842,14 @@
<test compset="FW4ma2000" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_mixed_sulfate">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA mixed sulfate test</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="FW4ma2000" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_mixed_sulfate">
<machines>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -757,28 +858,28 @@
</options>
</test>
<!-- carma test_growth -->
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_growth">
<test compset="QPC5" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_growth">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
<option name="comment" >CARMA particle growth test</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="F2000climo" grid="ne5pg3_ne5pg3_mg37" name="ERC_D_Ln9" testmods="cam/carma_dust">
<test compset="QPC5" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_growth">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
<option name="comment" >Low-res unstructured grid CARMA dust test</option>
<option name="comment" >CARMA particle growth test</option>
<option name="wallclock">00:30:00</option>
</options>
</test>
<test compset="QPC5" grid="ne5_ne5_mg37" name="SMS_D_Ln9" testmods="cam/carma_sea_salt">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="izumi" compiler="gnu" category="carma"/>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -799,6 +900,7 @@
<test compset="QPC5" grid="ne5_ne5_mg37" name="SMS_D_Ln9" testmods="cam/carma_test_passive">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="izumi" compiler="gnu" category="carma"/>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -809,6 +911,7 @@
<test compset="QPC5" grid="ne5_ne5_mg37" name="SMS_D_Ln9" testmods="cam/carma_test_swelling">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="izumi" compiler="gnu" category="carma"/>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -829,6 +932,7 @@
<test compset="QPC5" grid="ne5_ne5_mg37" name="SMS_D_Ln9" testmods="cam/carma_test_radiative">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="izumi" compiler="gnu" category="carma"/>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -839,6 +943,7 @@
<test compset="QPC5" grid="ne5_ne5_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="izumi" compiler="gnu" category="carma"/>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand All @@ -859,6 +964,7 @@
<test compset="QPWmaC6" grid="ne5pg3_ne5pg3_mg37" name="SMS_D_Ln9" testmods="cam/carma_meteor_smoke">
<machines>
<machine name="izumi" compiler="nag" category="carma"/>
<machine name="izumi" compiler="gnu" category="carma"/>
<machine name="derecho" compiler="intel" category="carma"/>
</machines>
<options>
Expand Down
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_dust/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ pbuf_global_allocate=.false.
history_carma=.true.
fincl2 = 'CRSLERFC'
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_meteor_impact/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ inithist='ENDOFRUN'
pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
solar_data_type='FIXED'
solar_data_ymd=20000101
carma_emis_maxlat = 40.
Expand Down
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_meteor_smoke/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ inithist='ENDOFRUN'
pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
solar_data_type='FIXED'
solar_data_ymd=20000101

1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_mixed_sulfate/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ inithist='ENDOFRUN'
pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
flbc_list = 'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH3BR', 'CH3CCL3', 'CH3CL', 'CH4', 'CO2', 'H2',
'HCFC22', 'N2O', 'OCS'
solar_data_type='FIXED'
Expand Down
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_pmc/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_do_partialinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_sea_salt/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ inithist='ENDOFRUN'
pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_sulfate/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ inithist='ENDOFRUN'
pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
flbc_list = 'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH3BR', 'CH3CCL3', 'CH3CL', 'CH4', 'CO2', 'H2',
'HCFC22', 'N2O', 'OCS'
solar_data_type='FIXED'
Expand Down
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_test_growth/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ inithist='ENDOFRUN'
pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_test_passive/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ inithist='ENDOFRUN'
pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_test_radiative/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ inithist='ENDOFRUN'
pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_test_swelling/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ inithist='ENDOFRUN'
pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_test_tracers/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ inithist='ENDOFRUN'
pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/cam/carma_test_tracers2/user_nl_cam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ inithist='ENDOFRUN'
pbuf_global_allocate=.false.
history_carma=.true.
carma_do_fixedinit=.false.
carma_reftfile="camrun.cam.r.carma_reft.nc"
Loading
Loading