Skip to content

Commit adaccfd

Browse files
fvittfvitt
authored
Merge pull request #1201 from fvitt/carma_base_tag
cam6_4_053: Update CARMA external base
2 parents ab1e8c7 + 56ccdb0 commit adaccfd

File tree

50 files changed

+3939
-1192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+3939
-1192
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
path = src/physics/carma/base
1010
url = https://github.com/ESCOMP/CARMA_base.git
1111
fxrequired = AlwaysRequired
12-
fxtag = carma4_01
12+
fxtag = carma4_09
1313
fxDONOTUSEurl = https://github.com/ESCOMP/CARMA_base.git
1414

1515
[submodule "pumas"]

‎bld/build-namelist‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1268,6 +1268,7 @@ if ($carma ne 'none') {
12681268
add_default($nl, 'carma_model', 'val'=>$carma);
12691269
add_default($nl, 'carma_flag', 'val'=>'.true.');
12701270
add_default($nl, 'history_carma', 'val'=>'.true.');
1271+
add_default($nl, 'carma_sulfnuc_method','val'=>'ZhaoTurco');
12711272
}
12721273
if ($carma eq 'bc_strat') {
12731274
add_default($nl, 'carma_do_drydep', 'val'=>'.true.');
@@ -1587,7 +1588,7 @@ if (defined $nl->get_value('prescribed_strataero_3modes')) {
15871588

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

15921593
unless (defined $nl->get_value('prescribed_strataero_type')) {
15931594
add_default($nl, 'prescribed_strataero_type','val'=>'CYCLICAL');

‎bld/namelist_files/namelist_definition.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4476,6 +4476,23 @@ is not active.
44764476
Default: none
44774477
</entry>
44784478

4479+
<entry id="carma_sulfnuc_method" type="char*10" category="carma"
4480+
group="carma_nl" valid_values="ZhaoTurco,Vehkamaki" >
4481+
Nucleation methods:
4482+
ZhaoTurco
4483+
Zhao, J. and Turco, R.,
4484+
Nucleation simulations in the wake of a jet aircraft in stratospheric flight,
4485+
J. Aerosol Sci., 26, 779-795, 1995,
4486+
https://doi.org/10.1016/0021-8502(95)00010-A
4487+
Vehkamaki
4488+
Vehkamaki, H., M. Kulmala, I. Napari, K.E.J. Lehtinen,
4489+
C. Timmreck, M. Noppel and A. Laaksonen, 2002,
4490+
An improved parameterization for sulfuric acid-water nucleation
4491+
rates for tropospheric and stratospheric conditions,
4492+
J. Geophys. Res., 107, 4622, doi:10.1029/2002jd002184
4493+
Default: none
4494+
</entry>
4495+
44794496
<entry id="carma_conmax" type="real" category="carma"
44804497
group="carma_nl" valid_values="" >
44814498
A fraction that scales how tight the convergence criteria are to

‎cime_config/testdefs/testlist_cam.xml‎

Lines changed: 113 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,15 @@
582582
<test compset="F2000climo" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_dust">
583583
<machines>
584584
<machine name="izumi" compiler="nag" category="carma"/>
585+
<machine name="izumi" compiler="gnu" category="carma"/>
586+
</machines>
587+
<options>
588+
<option name="comment" >CARMA dust test</option>
589+
<option name="wallclock">00:30:00</option>
590+
</options>
591+
</test>
592+
<test compset="F2000climo" grid="f19_f19_mg17" name="ERS_D_Ln9" testmods="cam/carma_dust">
593+
<machines>
585594
<machine name="derecho" compiler="intel" category="carma"/>
586595
</machines>
587596
<options>
@@ -602,7 +611,16 @@
602611
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_sea_salt">
603612
<machines>
604613
<machine name="izumi" compiler="nag" category="carma"/>
614+
<machine name="izumi" compiler="gnu" category="carma"/>
605615
<machine name="izumi" compiler="nag" category="aux_cam"/>
616+
</machines>
617+
<options>
618+
<option name="comment" >CARMA sea salt test</option>
619+
<option name="wallclock">00:30:00</option>
620+
</options>
621+
</test>
622+
<test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_sea_salt">
623+
<machines>
606624
<machine name="derecho" compiler="intel" category="carma"/>
607625
</machines>
608626
<options>
@@ -614,7 +632,15 @@
614632
<test compset="QPWmaC6" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_meteor_smoke">
615633
<machines>
616634
<machine name="izumi" compiler="nag" category="carma"/>
617-
<machine name="derecho" compiler="intel" category="carma"/>
635+
</machines>
636+
<options>
637+
<option name="comment" >CARMA test of aerosol from meteor smoke</option>
638+
<option name="wallclock">00:30:00</option>
639+
</options>
640+
</test>
641+
<test compset="QPWmaC6" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_meteor_smoke">
642+
<machines>
643+
<machine name="izumi" compiler="nag" category="carma"/>
618644
</machines>
619645
<options>
620646
<option name="comment" >CARMA test of aerosol from meteor smoke</option>
@@ -625,6 +651,15 @@
625651
<test compset="QPWmaC6" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_meteor_impact">
626652
<machines>
627653
<machine name="izumi" compiler="nag" category="carma"/>
654+
<machine name="izumi" compiler="gnu" category="carma"/>
655+
</machines>
656+
<options>
657+
<option name="comment" >CARMA test of aerosols from meteor impact</option>
658+
<option name="wallclock">00:30:00</option>
659+
</options>
660+
</test>
661+
<test compset="QPWmaC6" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_meteor_impact">
662+
<machines>
628663
<machine name="derecho" compiler="intel" category="carma"/>
629664
</machines>
630665
<options>
@@ -636,6 +671,15 @@
636671
<test compset="QPWmaC6" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_pmc">
637672
<machines>
638673
<machine name="izumi" compiler="nag" category="carma"/>
674+
<machine name="izumi" compiler="gnu" category="carma"/>
675+
</machines>
676+
<options>
677+
<option name="comment" >CARMA Test of Polar Mesospheric Clouds (pmc)</option>
678+
<option name="wallclock">00:30:00</option>
679+
</options>
680+
</test>
681+
<test compset="QPWmaC6" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_pmc">
682+
<machines>
639683
<machine name="derecho" compiler="intel" category="carma"/>
640684
</machines>
641685
<options>
@@ -647,6 +691,14 @@
647691
<test compset="QPC5" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_radiative">
648692
<machines>
649693
<machine name="izumi" compiler="nag" category="carma"/>
694+
</machines>
695+
<options>
696+
<option name="comment" >CARMA radiation test</option>
697+
<option name="wallclock">00:30:00</option>
698+
</options>
699+
</test>
700+
<test compset="QPC5" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_radiative">
701+
<machines>
650702
<machine name="derecho" compiler="intel" category="carma"/>
651703
</machines>
652704
<options>
@@ -655,9 +707,17 @@
655707
</options>
656708
</test>
657709
<!-- carma test_tracers -->
658-
<test compset="QPC5" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_tracers">
710+
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers">
659711
<machines>
660712
<machine name="izumi" compiler="nag" category="carma"/>
713+
</machines>
714+
<options>
715+
<option name="comment" >CARMA tracers test</option>
716+
<option name="wallclock">00:30:00</option>
717+
</options>
718+
</test>
719+
<test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers">
720+
<machines>
661721
<machine name="derecho" compiler="intel" category="carma"/>
662722
</machines>
663723
<options>
@@ -669,6 +729,14 @@
669729
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers2">
670730
<machines>
671731
<machine name="izumi" compiler="nag" category="carma"/>
732+
</machines>
733+
<options>
734+
<option name="comment" >CARMA tracers2 test</option>
735+
<option name="wallclock">00:30:00</option>
736+
</options>
737+
</test>
738+
<test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers2">
739+
<machines>
672740
<machine name="derecho" compiler="intel" category="carma"/>
673741
</machines>
674742
<options>
@@ -680,6 +748,14 @@
680748
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_passive">
681749
<machines>
682750
<machine name="izumi" compiler="nag" category="carma"/>
751+
</machines>
752+
<options>
753+
<option name="comment" >CARMA passive test</option>
754+
<option name="wallclock">00:30:00</option>
755+
</options>
756+
</test>
757+
<test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_passive">
758+
<machines>
683759
<machine name="derecho" compiler="intel" category="carma"/>
684760
</machines>
685761
<options>
@@ -691,6 +767,15 @@
691767
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_swelling">
692768
<machines>
693769
<machine name="izumi" compiler="nag" category="carma"/>
770+
<machine name="izumi" compiler="gnu" category="carma"/>
771+
</machines>
772+
<options>
773+
<option name="comment" >CARMA particle swelling test</option>
774+
<option name="wallclock">00:30:00</option>
775+
</options>
776+
</test>
777+
<test compset="QPC5" grid="f45_f45_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_swelling">
778+
<machines>
694779
<machine name="derecho" compiler="intel" category="carma"/>
695780
</machines>
696781
<options>
@@ -738,6 +823,14 @@
738823
<test compset="FW4ma2000" grid="f10_f10_mg37" name="SMS_D_Ln9" testmods="cam/carma_sulfate">
739824
<machines>
740825
<machine name="izumi" compiler="nag" category="carma"/>
826+
</machines>
827+
<options>
828+
<option name="comment" >CARMA pure sulfate test</option>
829+
<option name="wallclock">00:30:00</option>
830+
</options>
831+
</test>
832+
<test compset="FW4ma2000" grid="f45_f45_mg37" name="SMS_D_Ln9" testmods="cam/carma_sulfate">
833+
<machines>
741834
<machine name="derecho" compiler="intel" category="carma"/>
742835
</machines>
743836
<options>
@@ -749,6 +842,14 @@
749842
<test compset="FW4ma2000" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_mixed_sulfate">
750843
<machines>
751844
<machine name="izumi" compiler="nag" category="carma"/>
845+
</machines>
846+
<options>
847+
<option name="comment" >CARMA mixed sulfate test</option>
848+
<option name="wallclock">00:30:00</option>
849+
</options>
850+
</test>
851+
<test compset="FW4ma2000" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_mixed_sulfate">
852+
<machines>
752853
<machine name="derecho" compiler="intel" category="carma"/>
753854
</machines>
754855
<options>
@@ -757,28 +858,28 @@
757858
</options>
758859
</test>
759860
<!-- carma test_growth -->
760-
<test compset="QPC5" grid="f10_f10_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_growth">
861+
<test compset="QPC5" grid="f10_f10_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_growth">
761862
<machines>
762863
<machine name="izumi" compiler="nag" category="carma"/>
763-
<machine name="derecho" compiler="intel" category="carma"/>
764864
</machines>
765865
<options>
766866
<option name="comment" >CARMA particle growth test</option>
767867
<option name="wallclock">00:30:00</option>
768868
</options>
769869
</test>
770-
<test compset="F2000climo" grid="ne5pg3_ne5pg3_mg37" name="ERC_D_Ln9" testmods="cam/carma_dust">
870+
<test compset="QPC5" grid="f45_f45_mg37" name="ERS_D_Ln9" testmods="cam/carma_test_growth">
771871
<machines>
772-
<machine name="izumi" compiler="nag" category="carma"/>
872+
<machine name="derecho" compiler="intel" category="carma"/>
773873
</machines>
774874
<options>
775-
<option name="comment" >Low-res unstructured grid CARMA dust test</option>
875+
<option name="comment" >CARMA particle growth test</option>
776876
<option name="wallclock">00:30:00</option>
777877
</options>
778878
</test>
779879
<test compset="QPC5" grid="ne5_ne5_mg37" name="SMS_D_Ln9" testmods="cam/carma_sea_salt">
780880
<machines>
781881
<machine name="izumi" compiler="nag" category="carma"/>
882+
<machine name="izumi" compiler="gnu" category="carma"/>
782883
<machine name="derecho" compiler="intel" category="carma"/>
783884
</machines>
784885
<options>
@@ -799,6 +900,7 @@
799900
<test compset="QPC5" grid="ne5_ne5_mg37" name="SMS_D_Ln9" testmods="cam/carma_test_passive">
800901
<machines>
801902
<machine name="izumi" compiler="nag" category="carma"/>
903+
<machine name="izumi" compiler="gnu" category="carma"/>
802904
<machine name="derecho" compiler="intel" category="carma"/>
803905
</machines>
804906
<options>
@@ -809,6 +911,7 @@
809911
<test compset="QPC5" grid="ne5_ne5_mg37" name="SMS_D_Ln9" testmods="cam/carma_test_swelling">
810912
<machines>
811913
<machine name="izumi" compiler="nag" category="carma"/>
914+
<machine name="izumi" compiler="gnu" category="carma"/>
812915
<machine name="derecho" compiler="intel" category="carma"/>
813916
</machines>
814917
<options>
@@ -829,6 +932,7 @@
829932
<test compset="QPC5" grid="ne5_ne5_mg37" name="SMS_D_Ln9" testmods="cam/carma_test_radiative">
830933
<machines>
831934
<machine name="izumi" compiler="nag" category="carma"/>
935+
<machine name="izumi" compiler="gnu" category="carma"/>
832936
<machine name="derecho" compiler="intel" category="carma"/>
833937
</machines>
834938
<options>
@@ -839,6 +943,7 @@
839943
<test compset="QPC5" grid="ne5_ne5_mg37" name="ERC_D_Ln9" testmods="cam/carma_test_tracers">
840944
<machines>
841945
<machine name="izumi" compiler="nag" category="carma"/>
946+
<machine name="izumi" compiler="gnu" category="carma"/>
842947
<machine name="derecho" compiler="intel" category="carma"/>
843948
</machines>
844949
<options>
@@ -859,6 +964,7 @@
859964
<test compset="QPWmaC6" grid="ne5pg3_ne5pg3_mg37" name="SMS_D_Ln9" testmods="cam/carma_meteor_smoke">
860965
<machines>
861966
<machine name="izumi" compiler="nag" category="carma"/>
967+
<machine name="izumi" compiler="gnu" category="carma"/>
862968
<machine name="derecho" compiler="intel" category="carma"/>
863969
</machines>
864970
<options>

‎cime_config/testdefs/testmods_dirs/cam/carma_dust/user_nl_cam‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ pbuf_global_allocate=.false.
66
history_carma=.true.
77
fincl2 = 'CRSLERFC'
88
carma_do_fixedinit=.false.
9-
carma_reftfile="camrun.cam.r.carma_reft.nc"

‎cime_config/testdefs/testmods_dirs/cam/carma_meteor_impact/user_nl_cam‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ inithist='ENDOFRUN'
55
pbuf_global_allocate=.false.
66
history_carma=.true.
77
carma_do_fixedinit=.false.
8-
carma_reftfile="camrun.cam.r.carma_reft.nc"
98
solar_data_type='FIXED'
109
solar_data_ymd=20000101
1110
carma_emis_maxlat = 40.

‎cime_config/testdefs/testmods_dirs/cam/carma_meteor_smoke/user_nl_cam‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ inithist='ENDOFRUN'
55
pbuf_global_allocate=.false.
66
history_carma=.true.
77
carma_do_fixedinit=.false.
8-
carma_reftfile="camrun.cam.r.carma_reft.nc"
98
solar_data_type='FIXED'
109
solar_data_ymd=20000101
1110

‎cime_config/testdefs/testmods_dirs/cam/carma_mixed_sulfate/user_nl_cam‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ inithist='ENDOFRUN'
55
pbuf_global_allocate=.false.
66
history_carma=.true.
77
carma_do_fixedinit=.false.
8-
carma_reftfile="camrun.cam.r.carma_reft.nc"
98
flbc_list = 'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH3BR', 'CH3CCL3', 'CH3CL', 'CH4', 'CO2', 'H2',
109
'HCFC22', 'N2O', 'OCS'
1110
solar_data_type='FIXED'

‎cime_config/testdefs/testmods_dirs/cam/carma_pmc/user_nl_cam‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ pbuf_global_allocate=.false.
66
history_carma=.true.
77
carma_do_fixedinit=.false.
88
carma_do_partialinit=.false.
9-
carma_reftfile="camrun.cam.r.carma_reft.nc"

‎cime_config/testdefs/testmods_dirs/cam/carma_sea_salt/user_nl_cam‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ inithist='ENDOFRUN'
55
pbuf_global_allocate=.false.
66
history_carma=.true.
77
carma_do_fixedinit=.false.
8-
carma_reftfile="camrun.cam.r.carma_reft.nc"

0 commit comments

Comments
 (0)