-
Notifications
You must be signed in to change notification settings - Fork 140
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
cam6_4_028: Dust emissions #1104
Merged
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
610e7a9
implement soil erod switch
fvitt 5311341
implement soil erod switch for bulk model
fvitt 0322253
Merge remote-tracking branch 'origin/soil_erod_switch' into dust_emis…
fvitt 92b6bac
use Erik's CTSM branch
fvitt bfb1886
use shr_dust_emis_mod inquiry functions
fvitt 9cb0551
add checking for consistent settings; old atm/zender method b4b
fvitt f7b9e5d
define and set default namelist variables
fvitt b01294f
fix issue with aqua-planet
fvitt 37fae81
use new ctsm tag
fvitt e393c66
use Leung_2023 for cam7 phys
fvitt 712dead
Use Erik's CTSM hash; fix issues in build-namelist
fvitt ba285ec
fix issue in build-namelist
fvitt e6d302c
fix bug in emis scaling when Leung is used
fvitt eb6518a
Default Zender for all configs; use tag ctsm5.2.027
fvitt 62b248c
Merge remote-tracking branch 'ESCOMP/cam_development' into dust_emiss…
fvitt 95c159b
regression test Leung dust emis scheme
fvitt caa1bd3
correct typo in testlist_cam
fvitt 01c9a7a
Merge remote-tracking branch 'ESCOMP/cam_development' into dust_emiss…
fvitt 28e02f1
Increase time for HEMCO test
fvitt 1ea1baa
Remove soil_erod setting when Leung is used in buld dust; ChangeLog d…
fvitt a950fae
change megan setting appease the atm lnd drv_flds_in compare
fvitt c424825
Override LND_SETS_DUST_EMIS_DRV_FLDS only for cam7/clm6
fvitt e7627ac
update ChangeLog
fvitt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
cime_config/testdefs/testmods_dirs/cam/outfrq9s_Leung_dust/shell_commands
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
./xmlchange ROF_NCPL=\$ATM_NCPL | ||
./xmlchange GLC_NCPL=\$ATM_NCPL |
9 changes: 9 additions & 0 deletions
9
cime_config/testdefs/testmods_dirs/cam/outfrq9s_Leung_dust/user_nl_cam
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
dust_emis_method = 'Leung_2023' | ||
|
||
fincl2 = 'dst_a1SF', 'dst_a2SF', 'dst_a3SF' | ||
|
||
mfilt=1,1,1,1,1,1 | ||
ndens=1,1,1,1,1,1 | ||
nhtfrq=9,9,9,9,9,9 | ||
write_nstep0=.true. | ||
inithist='ENDOFRUN' |
27 changes: 27 additions & 0 deletions
27
cime_config/testdefs/testmods_dirs/cam/outfrq9s_Leung_dust/user_nl_clm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
!---------------------------------------------------------------------------------- | ||
! Users should add all user specific namelist changes below in the form of | ||
! namelist_var = new_namelist_value | ||
! | ||
! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options | ||
! are set in the CLM_NAMELIST_OPTS env variable. | ||
! | ||
! EXCEPTIONS: | ||
! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting | ||
! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting | ||
! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting | ||
! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting | ||
! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting | ||
! Set irrigate by the CLM_BLDNML_OPTS -irrig setting | ||
! Set dtime with L_NCPL option | ||
! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options | ||
! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases | ||
! (includes $inst_string for multi-ensemble cases) | ||
! Set glc_grid with CISM_GRID option | ||
! Set glc_smb with GLC_SMB option | ||
! Set maxpatch_glcmec with GLC_NEC option | ||
! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable | ||
!---------------------------------------------------------------------------------- | ||
hist_nhtfrq = 9 | ||
hist_mfilt = 1 | ||
hist_ndens = 1 | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@fvitt I was concerned about this at first in case it meant that the CAM Zender soil erodibility files were NOT being used. But, it looks like that is NOT the case. So this should be fine. I'm looking at it more closely. I'm glad you figured this workaround out.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is also probably fine since longer term we want to always make this TRUE and even remove it entirely. So that just brings us closer to the long term solution.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The only bad thing here is that it means that the way you change dust emission settings will be different for the CAM7 with CAM6 than for anything else. But, it's unlikely that people will be messing with the dust settings for previous CAM physics.