-
Notifications
You must be signed in to change notification settings - Fork 202
GCAFS prep emissions update - fire emissions #3713
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
Open
bbakernoaa
wants to merge
153
commits into
NOAA-EMC:develop
Choose a base branch
from
bbakernoaa:feature/prep_emis_rework
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 53 commits
Commits
Show all changes
153 commits
Select commit
Hold shift + click to select a range
ec8e772
add nexus
bbakernoaa d064d3a
add fire and nxs configs to config.aero
bbakernoaa 8de8885
seperate out into fire emision process and nexus emission process
bbakernoaa b4c5982
add input directories and source config.aero
bbakernoaa 4f74323
add COMIN_CHEM_INPUT
bbakernoaa 90c5f80
Add prep_emis for gcdas_half cycle
bbakernoaa b964997
Add com directories to prep emission
bbakernoaa ad249ef
Add newly generated data
bbakernoaa 668e91b
add anthropogenic
bbakernoaa b534a8b
adding finishing touches
bbakernoaa afa106f
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa c90dd91
add nexus submodule
bbakernoaa dec6de5
Update fire emissions directory path and adjust GOCART date handling …
bbakernoaa 0e512c9
pycodestyle fixes
bbakernoaa 4bf0a40
shellcheck fixes
bbakernoaa 14d3bd7
more shellcheck fixes
bbakernoaa 7d5dedb
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa 3ccdb91
minor syntax fix that didn't cause error
bbakernoaa 5cbb130
update GBBEPX emmissions for new format
bbakernoaa 8ac30ab
Merge branch 'feature/prep_emis_rework' of https://github.com/bbakern…
bbakernoaa 5d44905
update nexus hash for CAMS data config
bbakernoaa 8c39994
update nexus hash
bbakernoaa 8647595
address comments
bbakernoaa b586abd
fix: correct syntax error in NEXUS_INPUT_DIR retrieval
bbakernoaa 70a300d
remove duplicates
bbakernoaa fa8d7ee
refactor: remove commented-out code and unnecessary check for NEXUS_T…
bbakernoaa bab0db3
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa f213807
update nexus hash
bbakernoaa 7caea35
update nexus
bbakernoaa c340141
remove commented out imports
bbakernoaa 1154998
Refactor NEXUS emissions configuration and update forecast handling
bbakernoaa e106058
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa b077961
Update aviation emissions data and adjust forecast timing in GOCART a…
bbakernoaa d282736
Update NEXUS emissions task to use SDATE_GFS for date calculations an…
bbakernoaa e61516e
Update ChemFireEmissions to use SDATE_GFS for start and end date calc…
bbakernoaa 39e454b
Update subproject commit reference in nexus.fd
bbakernoaa 6ad4adf
Refactor _get_day_indices function to group datetime indices by day, …
bbakernoaa a3f1c36
Comment out data copying logic in GOCART_predet function for future i…
bbakernoaa c406f05
Update soil_drylimit_factor to improve emissions calculations
bbakernoaa ecf691e
change RUN variable in declare_from_tmpl for chemical input
bbakernoaa b53778c
Enhance ChemFireEmissions class to log forecast period details and ad…
bbakernoaa fdff907
Add NEXUS_INPUT_DIR for NEXUS emissions data source - temporarily har…
bbakernoaa e2271cb
Add commented placeholder for NEXUS_INPUT_DIR
bbakernoaa b374701
Fix formatting in NEXUSEmissions class for better readability
bbakernoaa a209927
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa eada24d
Fix indentation in nexus_emission.py
bbakernoaa fa8e35f
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa eac7da7
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa ca69431
Update dev/workflow/rocoto/gcafs_tasks.py
bbakernoaa d9b62fc
Add SettlingSolver options to resource files
bbakernoaa 68ecfc7
Merge branch 'NOAA-EMC:develop' into feature/prep_emis_rework
bbakernoaa 9179b1e
Update NEXUSEmissions to use CDATE for start and end dates; add loggi…
bbakernoaa 674f67b
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa 599f7b0
Update ush/python/pygfs/task/nexus_emission.py
bbakernoaa 5d65aac
Update ush/python/pygfs/task/chem_fire_emission.py
bbakernoaa b890b78
Refactor emissions task instantiation and enhance build script usage …
bbakernoaa 31aebbd
adding additional comments in the file to give users better descripti…
bbakernoaa b258a5f
pycodestyle fix W293
bbakernoaa 53b05cd
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa 655d327
Merge branch 'NOAA-EMC:develop' into feature/prep_emis_rework
bbakernoaa e570161
Remove debug print statements from NEXUSEmissions class initializatio…
bbakernoaa dc18f43
put a check on which launcher is used and adjust arglist
bbakernoaa af03b78
update chem_fire_emission to use CDATE for start_date
bbakernoaa 31670ea
remove the lookup for gbbepx_vars
bbakernoaa 09e0854
fix error on line 155
bbakernoaa be3d673
Add gbbepx_vars definition for emissions processing
bbakernoaa 8fe0af0
Remove redundant gbbepx_vars definition in ChemFireEmissions class
bbakernoaa 0d9bdd1
Update AERO_EMIS_FIRE_DIR for NRT forecast emissions processing
bbakernoaa e9165e3
update gbbepx file pattern as creation date could be different than s…
bbakernoaa 06a29eb
Implement GBBEPx NRT fire file search functionality for wcoss dcom an…
bbakernoaa 2959b03
Add NRT_DIRECTORY configuration and render_template method for GBBEPx…
bbakernoaa 1165914
Fix type hint for tmp_dict parameter in render_template method
bbakernoaa 031f03c
Fix parameter name in render_template method for clarity
bbakernoaa 3d841b9
Refactor _find_gbbepx_nrt_fires call to use single argument for version
bbakernoaa 0293bb5
Fix reference to AERO_EMIS_FIRE_DIR in render_template method to use …
bbakernoaa 3f6a0fc
Update AERO_EMIS_FIRE_DIR in task_config for historical emissions log…
bbakernoaa 7b115cd
Rename variables for clarity in ChemFireEmissions class
bbakernoaa ec5aeab
Refactor render_template method to return YAML configuration for impr…
bbakernoaa 3beb1d0
Add debug logging for file search in _find_gbbepx_files method
bbakernoaa fd4d432
Refactor render_template call to directly access AERO_EMIS_FIRE_NRT_D…
bbakernoaa f5e62d1
Update NRT_DIRECTORY reference to use FIRE_EMIS_NRT_DIR in YAML templ…
bbakernoaa e57f5c3
Add logging for GBBEPx NRT file discovery in ChemFireEmissions class
bbakernoaa 3d3a3b3
Add logging for historical emissions flag in ChemFireEmissions constr…
bbakernoaa e1bc13b
Fix GBBEPx NRT fires directory handling in ChemFireEmissions class
bbakernoaa 843ae71
Fix NRT_DIRECTORY access in ChemFireEmissions class to use dot notation
bbakernoaa 4d82538
Add pprint for debugging YAML configuration in ChemFireEmissions class
bbakernoaa de6b35f
Add pprint for debugging YAML configuration in ChemFireEmissions class
bbakernoaa 21f9043
Add pprint for NRT_DIRECTORY in ChemFireEmissions class
bbakernoaa 33779e0
Fix typo in NRT_DIRECTORY variable name in GBBEPx file search logging
bbakernoaa e3b04f1
Fix NRT_DIRECTORY variable usage in _find_gbbepx_nrt_fires method
bbakernoaa 000de2f
Refactor GBBEPx processing logic for historical and non-historical ca…
bbakernoaa cd77e7b
Update end date calculation and enhance logging for GBBEPx processing
bbakernoaa 00d6c6f
Refactor GBBEPx processing logic to use instance variable for histori…
bbakernoaa b2d3fae
Update time coordinate assignment in ChemFireEmissions to use assign_…
bbakernoaa 68d64bb
Fix time coordinate assignment in ChemFireEmissions to use a list for…
bbakernoaa 1cb4c2a
Fix output filename generation in ChemFireEmissions to use forecast d…
bbakernoaa 96f6fe1
Comment out time coordinate assignment in ChemFireEmissions to preven…
bbakernoaa 4570263
Update time coordinate assignment in ChemFireEmissions to set units b…
bbakernoaa dcf80a6
Update longitude attributes in ChemFireEmissions to include standard …
bbakernoaa cd2abc2
Refactor execution command in NEXUSEmissions to use APRUN for launchi…
bbakernoaa d2df1b1
Fix execution command in NEXUSEmissions to use relative path for nexus.x
bbakernoaa 865baa8
Merge branch 'NOAA-EMC:develop' into feature/prep_emis_rework
bbakernoaa 0691f99
Update aerosol optics file versions and enhance NEXUS emission file r…
bbakernoaa 483f5d7
Fix typo in import statement for Jinja in nexus_emission.py
bbakernoaa 464fa44
pycodestyle fixes
bbakernoaa cf248f6
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa 78aa5e1
Update ush/python/pygfs/task/snowens_analysis.py
bbakernoaa 87d756f
update dust to use drag_partition_option: 1 with the new file
bbakernoaa 1378357
update dust inputs in ExtData.other
bbakernoaa 488b075
rollback and add pycodestyle fix
bbakernoaa cdc1832
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa cbcb9cd
Enhance GBBEPx file search logic to check for previous dates and impr…
bbakernoaa 40ce24a
update netcdf header for NRT fire emission
bbakernoaa 89b3439
fix linking for nexus.x
bbakernoaa d748782
Add attributes for time dimension in processed dataset
bbakernoaa e4f80fb
Add check for NEXUS preprocessor executable availability
bbakernoaa 9903eb8
Refactor NEXUS executable check to use os.path.exists for improved cl…
bbakernoaa e0fda09
Update NEXUS executable path to use relative path for improved portab…
bbakernoaa ba7c5ab
Update commented AERO_INPUTS_DIR path for consistency across machines
bbakernoaa 086b91f
Adjust start and end date calculations for fire emissions processing;…
bbakernoaa 4074b99
move the prep_emis to the same dependency as stage_ic in gcdas_fcst
bbakernoaa 35d0d8b
correct variable
bbakernoaa d25339c
fix gcdas forecast dependencies
bbakernoaa 8e3d0d3
udpate gbbepx processing
bbakernoaa 5da1e6e
change fill value
bbakernoaa 431f15d
change rdrag parameter
bbakernoaa a990ee2
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa 5d8fa73
update nexus hash
bbakernoaa 063da78
updating nexus hash again
bbakernoaa eb0eb71
Create 'Restarts' directory in task_config.DATA during initialization
bbakernoaa 8c1f152
Merge branch 'NOAA-EMC:develop' into feature/prep_emis_rework
bbakernoaa 3922344
add logging for restarts directory creation
bbakernoaa 47e0e42
add nexus and gsi_utils for gcafs build_compute
bbakernoaa 1132ef8
update nexus restart data directory with updated nexus
bbakernoaa c3678d2
update nexus hash
bbakernoaa 7c78a09
upating nexus hash
bbakernoaa 5301cca
update nexus hash
bbakernoaa b6092fe
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa bc96036
Update GCAFS documentation and resource configuration
bbakernoaa 709e435
fix issue with historical gbbepx data
bbakernoaa 1fab3b0
make gbbepx default and add historical FIRE_EMIS_DIR
bbakernoaa 0d2ce2f
pycodestyle changes
bbakernoaa edd4860
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa 73ac752
updating nexus commit
bbakernoaa 382dcb5
updating nexus hash
bbakernoaa 483afe2
Merge branch 'feature/prep_emis_rework' of https://github.com/bbakern…
bbakernoaa 44db5d1
Merge branch 'develop' into feature/prep_emis_rework
bbakernoaa 57edce1
Update dev/parm/config/gcafs/config.aero.j2
bbakernoaa 14f5674
Update docs/source/gcafs.rst
bbakernoaa a0a436b
Update scripts/exglobal_stage_ic.py
bbakernoaa 31316c9
Update ush/python/pygfs/task/chem_fire_emission.py
bbakernoaa 069be65
Update ush/python/pygfs/task/chem_fire_emission.py
bbakernoaa 87f320b
Update dev/ush/compare_f90nml.py
bbakernoaa 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
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 |
---|---|---|
|
@@ -2,14 +2,18 @@ | |
|
||
# UFS-Aerosols settings | ||
|
||
# Path to the input data tree | ||
#================================================================================ | ||
# 1. Aerosol settings | ||
#================================================================================ | ||
export AERO_INPUTS_DIR="{{ AERO_INPUTS_DIR }}" | ||
|
||
#----------------------------------------------- | ||
# Diag Table and Field Table for GOCART aerosols | ||
#----------------------------------------------- | ||
export AERO_DIAG_TABLE="${PARMgfs}/ufs/fv3/diag_table.aero" | ||
export AERO_FIELD_TABLE="${PARMgfs}/ufs/fv3/field_table.aero" | ||
# Biomass burning emission dataset. Choose from: gbbepx, qfed, none | ||
export AERO_EMIS_FIRE="qfed" | ||
# Directory containing GOCART configuration files | ||
|
||
# Aerosol configuration | ||
export AERO_CONFIG_DIR="${PARMgfs}/ufs/gocart" | ||
|
||
# Aerosol convective scavenging factors (list of string array elements) | ||
|
@@ -20,4 +24,74 @@ export fscav_aero="'*:0.3','so2:0.0','msa:0.0','dms:0.0','nh3:0.4','nh4:0.6','bc | |
# Number of diagnostic aerosol tracers (default: 0) | ||
export dnats_aero=2 | ||
|
||
#================================================================================ | ||
# 2. Aerosol emissions settings | ||
#================================================================================ | ||
# Biomass burning emission dataset. Choose from: gbbepx, qfed, none | ||
export AERO_EMIS_FIRE="qfed" | ||
export AERO_EMIS_FIRE_VERSION="061" | ||
export AERO_EMIS_FIRE_HIST=1 # Use historical fire emissions | 1 = true 0 = false | ||
export FIRE_EMIS_NRT_DIR="" #TODO: set to DCOM for WCOSS2 "${DCOMROOT}/YYYYMMDD/firewx" # Directory containing NRT fire emissions | ||
|
||
#=============================================================================== | ||
# 3. NEXUS settings | ||
#=============================================================================== | ||
# NEXUS aerosol emissions dataset. Choose from: gocart, none | ||
|
||
# NEXUS configuration set | ||
export NEXUS_CONFIG="{{ NEXUS_CONFIG | default('gocart') }}" # Options: gocart, none | ||
export NEXUS_CONFIG_DIR="${PARMgfs}/chem/nexus/${NEXUS_CONFIG}" # Directory containing NEXUS configuration files | ||
|
||
# NEXUS Inputs | ||
# TODO: when this is merged this will point to AERO_INPUTS_DIR for operations | ||
# export NEXUS_INPUT_DIR="${AERO_INPUTS_DIR}/nexus" | ||
export NEXUS_INPUT_DIR="/gpfs/f6/bil-fire3/world-shared/Emissions/GEFS_ExtData/nexus" | ||
|
||
|
||
#-------------------------- | ||
# NEXUS Time Step (seconds) | ||
#-------------------------- | ||
export NEXUS_TSTEP="{{ NEXUS_TSTEP | default(3600) }}" # Default NEXUS time step in seconds | ||
|
||
#------------------ | ||
# NEXUS Grid | ||
#------------------ | ||
export NEXUS_NX="{{ NEXUS_NX | default(1440) }}" | ||
export NEXUS_NY="{{ NEXUS_NY | default(720) }}" | ||
export NEXUS_XMIN="{{ NEXUS_XMIN | default(-180.0) }}" | ||
export NEXUS_XMAX="{{ NEXUS_XMAX | default(180.0) }}" | ||
export NEXUS_YMIN="{{ NEXUS_YMIN | default(-90.0) }}" | ||
export NEXUS_YMAX="{{ NEXUS_YMAX | default(90.0) }}" | ||
export NEXUS_NZ="{{ NEXUS_NZ | default(1) }}" | ||
|
||
#------------------- | ||
# NEXUS Config Files | ||
#------------------- | ||
export NEXUS_GRID_NAME="{{ NEXUS_GRID_NAME | default('HEMCO_sa_Grid.rc') }}" | ||
export NEXUS_TIME_NAME="{{ NEXUS_TIME_NAME | default('HEMCO_sa_Time.rc') }}" | ||
export NEXUS_DIAG_NAME="{{ NEXUS_DIAG_NAME | default('HEMCO_sa_Diag.rc') }}" | ||
export NEXUS_SPEC_NAME="{{ NEXUS_SPEC_NAME | default('HEMCO_sa_Spec.rc') }}" | ||
export NEXUS_CONFIG_NAME="{{ NEXUS_CONFIG_NAME | default('NEXUS_Config.rc') }}" | ||
|
||
#------------------ | ||
# NEXUS Diagnostics | ||
#------------------ | ||
export NEXUS_DIAG_PREFIX="{{ NEXUS_DIAG_PREFIX | default('NEXUS_DIAG') }}" | ||
export NEXUS_DIAG_FREQ="{{ NEXUS_DIAG_FREQ | default('Hourly') }}" # Options: Hourly, Daily, Monthly | ||
|
||
#------------------ | ||
# NEXUS Logging | ||
#------------------ | ||
export NEXUS_LOGFILE="{{ NEXUS_LOGFILE | default('NEXUS.log') }}" | ||
|
||
#------------------ | ||
# NEXUS Emissions | ||
#------------------ | ||
export NEXUS_DO_MEGAN=.false # TODO: Add MEGAN biogenic emissions in the furture | ||
export NEXUS_DO_CEDS2019=.true. # Use CEDS2019 emissions | ||
export NEXUS_DO_CEDS2024=.false. # Use CEDS2024 emissions | ||
export NEXUS_DO_HTAPv2=.true. # Use HTAPv2 emissions | ||
export NEXUS_DO_HTAPv3=.false. # TODO: Currently only uses HTAPv2 for this. | ||
export NEXUS_DO_CAMS=.false. # Use CAMS global emissions | ||
export NEXUS_DO_CAMSTEMPO=.false. # Use CAMS temporal emissions | ||
bbakernoaa marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
echo "END: config.aero" |
This file contains hidden or 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 hidden or 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 hidden or 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.
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.
Do we need to get this branch into develop before the workflow PR is 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.
Yes but that should be very simple to do
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'd like to have this squared away before merging, but I will start reviewing (and testing once reviews are complete).