-
Notifications
You must be signed in to change notification settings - Fork 180
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
Update feature/coupled-crow to run the latest ufs-weather-model with prognostic aerosols #338
Closed
rmontuoro
wants to merge
45
commits into
NOAA-EMC:feature/coupled-crow
from
rmontuoro:feature/update-aerosols
Closed
Changes from 9 commits
Commits
Show all changes
45 commits
Select commit
Hold shift + click to select a range
b7da671
Checkout and build ufs-weather-model app integrating
rmontuoro 5c8e078
Use proper modulefiles for updated ufs-weather-model
rmontuoro e2f52cc
Update parsing function for FV3 namelist to work
rmontuoro ff971a2
Add aerosol scavenging factors (fscav_aero) to FV3 settings.
rmontuoro d16630f
Properly set NST_SPINUP flag in FV3 namelist.
rmontuoro c26a0dd
Restore `cplchem` as the flag for coupled aerosols,
rmontuoro 9661d1e
- Set NEMS identifier for coupled aerosol component to 'gocart'.
rmontuoro 52dbd17
Update test cases and input files for coupled aerosols runs.
rmontuoro bc7c20a
Add scavenging factors to aerosol test cases.
rmontuoro f81741b
Use updated modulefile names only when building the
rmontuoro 0307896
Load updated modulefiles for coupled aerosols on Hera/Intel.
rmontuoro 6b19a39
Remove GSD-specific functions in forecast postdet.
rmontuoro 8a8194f
Remove no longer needed parsing script used to
rmontuoro a821a1a
Return proper name for Hera platform and load correct modules.
rmontuoro c5456b5
Load aerosol-specific modulefiles only for the forecast task.
rmontuoro d4f246a
Merge branch 'WalterKolczynski-NOAA:feature/aerosol_restart' into fea…
rmontuoro bfe150a
Replace legacy 'cplgocart' flag with 'cplchem'.
rmontuoro 88f0358
Update tracer list.
rmontuoro 521141d
Merge branch 'WalterKolczynski-NOAA:feature/aerosol_restart' into fea…
rmontuoro 2c40cdc
Restore original path to modulefiles in module_base.hera.
rmontuoro 76f8fa2
Merge 'WalterKolczynski-NOAA:feature/aerosol_restart' into feature/up…
rmontuoro 7e84ea4
Update aerosol_firex_forecast test case.
rmontuoro 165c2b7
update wave ww3_multi.inp file Issue #325
JessicaMeixner-NOAA 6f4a3f2
Update UFS model hash
WalterKolczynski-NOAA d0de272
Update MOM_input with landmask change option
WalterKolczynski-NOAA 56d5597
Update CICE inputs for new model version
WalterKolczynski-NOAA 434d7c6
Update UFS build script
WalterKolczynski-NOAA e86db23
Update source of fd_nems.yaml
WalterKolczynski-NOAA 12050b8
Update templates to set ocean mesh file
WalterKolczynski-NOAA d4910b5
Update Ww3 prepost build
WalterKolczynski-NOAA 351f5aa
Update meditaor name
WalterKolczynski-NOAA 88fb063
Update wave IC
WalterKolczynski-NOAA 1957bb9
Update modules to match UFS
WalterKolczynski-NOAA 2dcf8f2
Update ice configuration to match UFS
WalterKolczynski-NOAA 89c3fa0
Merge branch 'feature/coupled-crow' into feature/model_update
WalterKolczynski-NOAA 6a17f52
Merge 'feature/coupled-crow' into feature/update-aerosols
rmontuoro 4fc8131
Add ammonia and nitrates to the list of cycled GOCART tracers.
rmontuoro acdc6a6
Update checkout and build script to use the authoritative
rmontuoro a51d4ef
Add spaces to indent FV3 build section for better readability
KateFriedman-NOAA 5bec2a7
Add FV3_GFS_v16_couplednsst CCPP suite option to UFS coupled build an…
KateFriedman-NOAA bbcad18
Replace CROW yaml nst_spinup_logic in nsst.yaml with NST_SPINUP variable
KateFriedman-NOAA cec6188
Add NSST settings to the coupled_free_forecast_wave.yaml case file
KateFriedman-NOAA d303997
Update nems.configure to inclue eps_imesh
WalterKolczynski-NOAA 771832d
Merge branch 'feature/model_update' into feature/update-aerosols
WalterKolczynski-NOAA dc970f9
Change forecast module back to module_base
WalterKolczynski-NOAA 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,158 +1,169 @@ | ||
| # added by FRE: sphum must be present in atmos | ||
| # specific humidity for moist runs | ||
| "TRACER", "atmos_mod", "sphum" | ||
| "longname", "specific humidity" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| "longname", "specific humidity" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| # prognostic cloud water mixing ratio | ||
| "TRACER", "atmos_mod", "liq_wat" | ||
| "longname", "cloud water mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| "longname", "cloud water mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| "TRACER", "atmos_mod", "rainwat" | ||
| "longname", "rain mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| "longname", "rain mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| "TRACER", "atmos_mod", "ice_wat" | ||
| "longname", "cloud ice mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| "longname", "cloud ice mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| "TRACER", "atmos_mod", "snowwat" | ||
| "longname", "snow mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| "longname", "snow mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| "TRACER", "atmos_mod", "graupel" | ||
| "longname", "graupel mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| "longname", "graupel mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| # prognostic ozone mixing ratio tracer | ||
| "TRACER", "atmos_mod", "o3mr" | ||
| "longname", "ozone mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| # prognostic so2 mixing ratio tracer | ||
| "longname", "ozone mixing ratio" | ||
| "units", "kg/kg" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| # prognostic subgrid scale turbulent kinetic energy | ||
| "TRACER", "atmos_mod", "sgs_tke" | ||
| "longname", "subgrid scale turbulent kinetic energy" | ||
| "units", "m2/s2" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| # prognostic chemistry tracers | ||
| "TRACER", "atmos_mod", "so2" | ||
| "longname", "so2 mixing ratio" | ||
| "units", "ppm" | ||
| "profile_type", "fixed", "surface_value=5.e-6" / | ||
| # prognostic sulfate mixing ratio tracer | ||
| "TRACER", "atmos_mod", "sulf" | ||
| "longname", "sulfate mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=3.e-6" / | ||
| # prognostic DMS mixing ratio tracer | ||
| "longname", "so2 mixing ratio" | ||
| "units", "ppm" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=5.e-6" / | ||
| "TRACER", "atmos_mod", "so4" | ||
| "longname", "sulfate mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=3.e-6" / | ||
| "TRACER", "atmos_mod", "dms" | ||
| "longname", "DMS mixing ratio" | ||
| "units", "ppm" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic msa mixing ratio tracer | ||
| "longname", "DMS mixing ratio" | ||
| "units", "ppm" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "msa" | ||
| "longname", "msa mixing ratio" | ||
| "units", "ppm" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic bc1 mixing ratio tracer | ||
| "longname", "msa mixing ratio" | ||
| "units", "ppm" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "bc1" | ||
| "longname", "hydrophobic black carbon mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic bc2 mixing ratio tracer | ||
| "longname", "hydrophobic black carbon mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "bc2" | ||
| "longname", "hydrophillic black carbon mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic oc1 mixing ratio tracer | ||
| "longname", "hydrophillic black carbon mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "oc1" | ||
| "longname", "hydrophobic organic carbon mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic oc2 mixing ratio tracer | ||
| "longname", "hydrophobic organic carbon mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "oc2" | ||
| "longname", "hydrophillic organic carbon mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic dust1 mixing ratio tracer | ||
| "longname", "hydrophillic organic carbon mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "dust1" | ||
| "longname", "fine dust1 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic dust2 mixing ratio tracer | ||
| "longname", "fine dust1 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "dust2" | ||
| "longname", "fine dust2 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic dust3 mixing ratio tracer | ||
| "longname", "fine dust2 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "dust3" | ||
| "longname", "coarse dust3 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic dust4 mixing ratio tracer | ||
| "longname", "coarse dust3 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "dust4" | ||
| "longname", "coarse dust4 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic dust5 mixing ratio tracer | ||
| "longname", "coarse dust4 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "dust5" | ||
| "longname", "coarse dust5 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic seas1 mixing ratio tracer | ||
| "longname", "coarse dust5 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "seas1" | ||
| "longname", "seasalt1 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic seas2 mixing ratio tracer | ||
| "longname", "seasalt1 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "seas2" | ||
| "longname", "seasalt2 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic seas3 mixing ratio tracer | ||
| "longname", "seasalt2 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "seas3" | ||
| "longname", "seasalt3 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic seas4 mixing ratio tracer | ||
| "longname", "seasalt3 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "seas4" | ||
| "longname", "seasalt4 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic seas5 mixing ratio tracer | ||
| "longname", "seasalt4 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "seas5" | ||
| "longname", "seasalt5 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| # prognostic NI mixing ratio tracer | ||
| "longname", "seasalt5 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e-7" / | ||
| "TRACER", "atmos_mod", "nh3" | ||
| "longname", "primary NH3 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| "longname", "primary NH3 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| "TRACER", "atmos_mod", "nh4a" | ||
| "longname", "primary NH4a mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| "longname", "primary NH4a mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| "TRACER", "atmos_mod", "no3an1" | ||
| "longname", "primary NO3an1 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| "longname", "primary NO3an1 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| "TRACER", "atmos_mod", "no3an2" | ||
| "longname", "primary NO3an2 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| "longname", "primary NO3an2 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| "TRACER", "atmos_mod", "no3an3" | ||
| "longname", "primary NO3an3 mixing ratio" | ||
| "units", "ug/kg" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| # diagnostic pm2.5 tracer | ||
| "TRACER", "atmos_mod", "pp25" | ||
| "longname", "primary PM25 mixing ratio" | ||
| "units", "ug/m3" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| # diagnostic pm10 tracer | ||
| "TRACER", "atmos_mod", "pp10" | ||
| "longname", "primary PM10 mixing ratio" | ||
| "units", "ug/m3" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| "longname", "primary NO3an3 mixing ratio" | ||
| "units", "ug/kg" | ||
| "tracer_usage", "chemistry" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| # diagnostic chemistry tracers | ||
| "TRACER", "atmos_mod", "pm25" | ||
| "longname", "primary PM25 mixing ratio" | ||
| "units", "ug/m3" | ||
| "tracer_usage", "chemistry", "type=diagnostic" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| "TRACER", "atmos_mod", "pm10" | ||
| "longname", "primary PM10 mixing ratio" | ||
| "units", "ug/m3" | ||
| "tracer_usage", "chemistry", "type=diagnostic" | ||
| "profile_type", "fixed", "surface_value=1.e+0" / | ||
| # non-prognostic cloud amount | ||
| "TRACER", "atmos_mod", "cld_amt" | ||
| "longname", "cloud amount" | ||
| "units", "1" | ||
| "profile_type", "fixed", "surface_value=1.e30" / | ||
| "longname", "cloud amount" | ||
| "units", "1" | ||
| "profile_type", "fixed", "surface_value=1.e30" / |
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
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.
So you have switched to using your fork, but as soon as this PR goes into ufs-weather-model this build check will not work anymore. Do we address that now or 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.
In the most recent versions of
ufs-weather-modelall modulefiles have been renamed as:ufs_<machine>.<compiler_settings>. This change introduces the update and should work from now on.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.
But you didn't update the hash of what is checked out for the ufs-weather-model for the coupled case. Therefore this will break the coupled case as is, unless I missed that.
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 was my issue as well. The currently non-aerosol coupled-crow ufs model version is still using the old naming convention. So this PR would break that until #324 is also merged.
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.
(And vice versa)
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.
You are right. My assumption was that we were going to update to the latest ufs-weather-model for the coupled case, too, before or at the same time as this PR. I will address this issue by adding a conditional block.
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.
I hope we will update ufs-weather-model for the other case very soon, but as of now #324 is remains an unassigned task.
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.
Commit f81741b addresses this issue. Updated modulefiles are only loaded to build the ufs-weather-model with prognostic aerosols. This model is identified though a hidden file, created when using option
-aduring checkout.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.
Looks like I'm too late and the complications have already been added, but I'm going to try and tackle #324 after we clear a couple of the other PRs out. So let's cool it with adding more if-block exceptions for aerosols when we want to be removing them.
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.
At least until we can discuss it in the afternoon.