Skip to content
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.

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

hs-uii: Merge in latest b4b-dev #6

Merged
merged 75 commits into from
Sep 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
7d8d0f6
Add failing tests for running with dust set by CAM so LND_SETS_DUST_E…
ekluzek Aug 14, 2024
a590ca7
When LND_SETS_DUST_EMIS_DRV_FLDS is FALSE read in CAM drv_flds_in nam…
ekluzek Aug 15, 2024
733cf99
Add missing cmeps drv_flds_in variables fixing #2170
ekluzek Aug 15, 2024
3f3541b
Current drv_flds_in file from CAM for a FHIST case, including some fi…
ekluzek Aug 15, 2024
6268e59
Add megan and drydep settings as per a cam6_4_015 SMS_Ln9.f19_f19_mg1…
ekluzek Aug 16, 2024
6b0b655
Improve peat burning dependence on climate.
samsrabin Aug 16, 2024
617f88b
Improve dependence of deforestation burning on climate.
samsrabin Aug 16, 2024
97405d7
Add (1) lightning igns in trop. closed forests, (2) landscape frag su…
samsrabin Aug 16, 2024
8418ec4
Recalibrate li2024gswpfrc (namelist parameters only).
samsrabin Aug 16, 2024
8de6580
Add fire_method li2024crujra.
samsrabin Aug 16, 2024
5e82825
Whitespace and comment fixes.
samsrabin Aug 16, 2024
e9b629d
Simplify the validation checking for megan specifier as the expressio…
ekluzek Aug 16, 2024
bedff9c
Whitespace and comment improvements.
samsrabin Aug 20, 2024
861004b
Add parameter max_rh30_affecting_fuel.
samsrabin Aug 20, 2024
2d2e093
Add parameters for thresholds of precip for deforestation fire:
samsrabin Aug 21, 2024
fbb2d89
Add parameters relating to peat fire.
samsrabin Aug 21, 2024
a3edb47
Ensure new parameters are double-precision.
samsrabin Aug 21, 2024
53a1874
CAM_SETS_DRV_FLDS tests don't need to have drv_flds_in settings to be…
ekluzek Aug 21, 2024
717f957
Get working with bringing in CAM drv_flds_in
ekluzek Aug 21, 2024
973f5e7
Make one more constant double-precision.
samsrabin Aug 21, 2024
786252b
Merge remote-tracking branch 'escomp/b4b-dev' into fix_cam_dust_emiss…
ekluzek Aug 21, 2024
89e56ce
Update ChangeLog/ChangeSum.
samsrabin Aug 22, 2024
50edd8e
Merge pull request #2711 from samsrabin/fire-li2024-pr2
samsrabin Aug 22, 2024
406edd4
Add some comments about some of this being temporary and point to the…
ekluzek Aug 22, 2024
fa7f8f5
Fix bug in setting of init_interp_attributes that should have been fo…
ekluzek Aug 22, 2024
796bd83
Get the megan_spec checker working for identifying bad characters in …
ekluzek Aug 22, 2024
5cf4216
Turn on explicit AC, Leung_2023, and excess ice by default
slevis-lmwg Aug 22, 2024
e4a3c18
Add finidat entries for f09/1850/clm6 cases
slevis-lmwg Aug 22, 2024
b12cea1
Revisions so that changes apply to clm6 only
slevis-lmwg Aug 22, 2024
b2d7edf
Duplicate a bunch of XML so that the namelist unit tester works for a…
ekluzek Aug 22, 2024
be5d1d6
Change fatal error to warning for megan_specifier
ekluzek Aug 22, 2024
a5a15ed
Correct test number and remove fail tests that are now allowed to hap…
ekluzek Aug 22, 2024
ae4d423
Merge remote-tracking branch 'escomp/b4b-dev' into fix_cam_dust_emiss…
ekluzek Aug 22, 2024
c61aca3
Update to use the new ctsm5.3 finidat file for f09 1850
ekluzek Aug 23, 2024
86a8db9
Allow non-agri fire in trop. forests in last timestep of month.
samsrabin Aug 23, 2024
bb08dbf
li2024 fire now fully obeys cli_scale.
samsrabin Aug 23, 2024
5645313
Add a comment to guide future refactoring.
samsrabin Aug 23, 2024
00d288b
Change CTSM machine default for Derecho to develop queue w/ 32 cpus.
samsrabin Aug 21, 2024
add600b
Change to 16 to match GMAKE_J.
samsrabin Aug 23, 2024
d726682
Merge pull request #2718 from samsrabin/runsystests-dev-queue
samsrabin Aug 23, 2024
d4042ee
This may be the finidat fix (based on the aux_clm failures on izumi)
slevis-lmwg Aug 23, 2024
66159ed
Merge branch 'ans_chging_tag_1' of github.com:slevis-lmwg/CTSM into a…
ekluzek Aug 23, 2024
585935a
Update ChangeLog and ChangeSum.
samsrabin Aug 23, 2024
72691ea
Merge pull request #2726 from samsrabin/fire-li2024-pr2
samsrabin Aug 23, 2024
5d6987e
More finidat changes based on aux_clm failure on derecho
slevis-lmwg Aug 23, 2024
0731518
Merge remote-tracking branch 'escomp/master' into ans_chging_tag_1
slevis-lmwg Aug 23, 2024
8594b7d
Add comments about the new finidat file
slevis-lmwg Aug 23, 2024
32637e6
Draft ChangeLog/ChangeSum
slevis-lmwg Aug 23, 2024
dd9b1b0
Add use_init_interp to an f19 test using the new f09 finidat
slevis-lmwg Aug 23, 2024
7f76dc0
Updated ChangeLog
slevis-lmwg Aug 23, 2024
2b28850
Merge pull request #2724 from slevis-lmwg/ans_chging_tag_1
slevis-lmwg Aug 24, 2024
b35320a
Also include the mizuRoute expected fails list
ekluzek Dec 8, 2021
463e85d
Add bit from SLIM that includes what parts FAIL when reporting summar…
ekluzek Jan 20, 2022
8fbfcc0
Add an extra tab
ekluzek Jan 25, 2022
0d1a867
Make a little subroutine to check the expected fails
ekluzek Aug 26, 2024
cd6a94b
Report on the expected fails for tests
ekluzek Aug 26, 2024
c5aeec6
Add some more notes about -drydep, -fire_emis, -no-megan options opti…
ekluzek Aug 27, 2024
46a09d9
Update some of the documentation around the -drydep, -fire_emis and -…
ekluzek Aug 27, 2024
9a44188
Update documentation around the drv_flds_in testing namelists and com…
ekluzek Aug 27, 2024
d8377a8
Merge remote-tracking branch 'escomp/b4b-dev' into fix_cam_dust_emiss…
ekluzek Aug 27, 2024
1ddecad
Merge pull request #2699 from ekluzek/fix_cam_dust_emiss_control
ekluzek Aug 27, 2024
8f9ae4e
Merge tag 'ctsm5.2.026' into merge-b4bdev-20240827
ekluzek Aug 27, 2024
f1ad74d
Update change log for new b4b-dev tag, make standard for python testi…
ekluzek Aug 27, 2024
ddec553
Update change files
ekluzek Aug 27, 2024
bae5c8c
Update ChangeLog with more details
ekluzek Aug 28, 2024
9fd631a
Update CDEPS to hopefully resolve the CDEPS build issue I ran into
ekluzek Aug 28, 2024
4bc9545
Increase wall limit for test
ekluzek Aug 28, 2024
41c3e09
Remove tests that now pass from expected fails
ekluzek Aug 28, 2024
729b688
Another test no longer failing, and fix accidental addition
ekluzek Aug 29, 2024
4a62d0d
Update date for change files
ekluzek Aug 29, 2024
0999a32
Merge pull request #2731 from ekluzek/merge-b4bdev-20240827
ekluzek Aug 29, 2024
1792237
Merge tag 'ctsm5.2.027' into merge-master-20240828
ekluzek Aug 29, 2024
e707519
Merge pull request #2733 from ekluzek/merge-master-20240828
ekluzek Aug 29, 2024
22ceaf9
Merge remote-tracking branch 'escomp/b4b-dev' into hs-uii-ssr
samsrabin Sep 13, 2024
e205e2e
Ignore warnings in Hillslope tests.
samsrabin Sep 13, 2024
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
Prev Previous commit
Next Next commit
Revisions so that changes apply to clm6 only
slevis-lmwg committed Aug 22, 2024
commit b12cea1d6061450be368138fb12a1eacd9340972
8 changes: 4 additions & 4 deletions bld/namelist_files/namelist_defaults_ctsm.xml
Original file line number Diff line number Diff line change
@@ -161,10 +161,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<calc_human_stress_indices phys="clm4_5" >NONE</calc_human_stress_indices>

<!-- Explicit, time-varying urban air conditioning adoption rate scheme -->
<urban_explicit_ac>.false.</urban_explicit_ac>
<urban_explicit_ac phys="clm6_0" >.true.</urban_explicit_ac>
<urban_explicit_ac phys="clm5_1" >.false.</urban_explicit_ac>
<urban_explicit_ac phys="clm5_0" >.false.</urban_explicit_ac>
<urban_explicit_ac phys="clm4_5" >.false.</urban_explicit_ac>

<!-- Default urban traffic flux -->
<urban_traffic>.false.</urban_traffic>
@@ -2706,7 +2704,9 @@ lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_TOOL_hist_78pfts_CMIP6_simyr2000_c
<!-- Defaults for excess ice -->
<!-- ========================================= -->

<use_excess_ice>.true.</use_excess_ice>
<use_excess_ice>.false.</use_excess_ice>
<use_excess_ice phys="clm6_0">.true.</use_excess_ice>

<excess_ice_coldstart_temp>-1.0</excess_ice_coldstart_temp>
<excess_ice_coldstart_depth>0.5</excess_ice_coldstart_depth>
<excess_ice_coldstart_temp use_excess_ice=".true.">-3.15</excess_ice_coldstart_temp>
3 changes: 2 additions & 1 deletion bld/namelist_files/namelist_defaults_dust_emis.xml
Original file line number Diff line number Diff line change
@@ -14,7 +14,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
-->

<!-- Defaults for dust_emis_inparm namelist -->
<dust_emis_method>Leung_2023</dust_emis_method>
<dust_emis_method>Zender_2003</dust_emis_method>
<dust_emis_method phys="clm6_0">Leung_2023</dust_emis_method>

<zender_soil_erod_source>atm</zender_soil_erod_source>