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.

Sign up for GitHub

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

Jump to bottom

Merge all new features from develop into develop_aircraft #171

Merged
merged 256 commits into from
Mar 16, 2023
Merged

Merge all new features from develop into develop_aircraft #171

merged 256 commits into from
Mar 16, 2023

Conversation

colin-harkins
Copy link
Collaborator

This pull request merges all of the new features added to develop into the develop_aircraft branch.

davidfillmore and others added 30 commits August 1, 2022 14:57
@davidfillmore
Point to correct YAML file.
f4e642d
@davidfillmore
Use /Users/davidfillmore env variable.
1d7c67e
@davidfillmore
Added path substitution with env vars to subsetter.
a9c7526
@davidfillmore
Start on model.sub_env_vars.
1f32b6d
@davidfillmore
Changed fnames to file_str.
f88a5a3
@davidfillmore
First implementation of model.env_sub.
8f219ea
@davidfillmore
Moved env_sub to util/env_sub.py.
3db427e
@davidfillmore
Call env_sub in open_obs.
15181b0
@davidfillmore
Call env_sub on output_dir in read_control.
c5baf24
@davidfillmore
Use os.path.expandvars.
7c3fad3
@davidfillmore
Use os.path.expandvars.
626ba86
@davidfillmore
Use os.path.expandvars.
3797a51
@davidfillmore
Removed local imports os.path.expandsvars.
ed51162
@davidfillmore
Simplfied use of expandvars.
7f1d8ed
@davidfillmore
Use HOME path in YAML file.
fdbadbf
@davidfillmore
Updated YAML output_dir, files, and filename options with: shell vari…
8a2bdf9 
…ables prefixed with $ ...
@davidfillmore
Moved model expandvars to open_models, included now for files, and, f…
5bf8b62 
…or CMAQ, files_vert and files_surface.
@davidfillmore
Added shell var expansion notes for files_vert and files_surf.
eb54567
@davidfillmore
Use tt font for $ and /Users/davidfillmore.
3d2d5c8
@davidfillmore
Merge branch 'develop_envvar' into develop_subsetter
71fde54
@dwfncar
Added grid_util.
6bf7068
@dwfncar
Merge branch 'develop_envvar' into develop_grid
eed9dd1
@dwfncar
Added tests_obs_setup.py and test_grid.yaml.
347d4d8
@dwfncar
Start on test_grid driver.
4f10844
@dwfncar
Changed obs filename to files for gridding tests.
a2adfa9
@dwfncar
Renamed test_obs_setup.py to setup_obs.py.
1471e33
@dwfncar
Added test obs reader.
902b4fb
@dwfncar
Replace * with suffix for multiple files.
97128be
@dwfncar
Added sparse_data_grid nlon, nlat to control.
ab58920
@dwfncar
Generate grid in test_grid program.
e363b66
colin-harkins and others added 25 commits February 28, 2023 14:08
@colin-harkins
Merge pull request NOAA-CSL#163 from colin-harkins/develop_outputdire…
9e4e803 
…rror2

Add error when output_dir not specified (updated)
@zmoon
Specify projection for generic by referencing defined model
3f871ea
@zmoon
Can't use map_projection() until model loaded
257c46f
@zmoon
Merge pull request NOAA-CSL#164 from zmoon/tweak
1198564 
Tweak
@dwfncar
Merge branch 'develop' into develop_subsetter
90fdb45
@dwfncar @zmoon
Update examples/subset/airnow_wrfchem.yaml
ea85898 
Co-authored-by: Zachary Moon <zmoon92@gmail.com>
@dwfncar
Merge pull request NOAA-CSL#93 from NOAA-CSL/develop_subsetter
dfe71ab 
First pass at subsetter.py
@colin-harkins
Add eval method for projection
5bd8545
@colin-harkins
Update docs about projection
cde3c99
@colin-harkins
Merge pull request NOAA-CSL#168 from colin-harkins/develop_crseval
fe3f8b3 
Add method for setting projection with cartopy.crs code passed to eval()
@colin-harkins
Fix spelling in yaml.rst
efb8938
@colin-harkins @zmoon
Update docs/appendix/yaml.rst
db038c8 
Co-authored-by: Zachary Moon <zmoon92@gmail.com>
@colin-harkins @zmoon
Update docs/appendix/yaml.rst
463dec4 
Co-authored-by: Zachary Moon <zmoon92@gmail.com>
@colin-harkins @zmoon
Update docs/appendix/yaml.rst
396a2b6 
Co-authored-by: Zachary Moon <zmoon92@gmail.com>
@colin-harkins
Update yaml.rst
17adb6f
@colin-harkins @zmoon
Update docs/appendix/yaml.rst
606877c 
Co-authored-by: Zachary Moon <zmoon92@gmail.com>
@colin-harkins @zmoon
Update docs/appendix/yaml.rst
3a6f607 
Co-authored-by: Zachary Moon <zmoon92@gmail.com>
@colin-harkins @zmoon
Update docs/appendix/yaml.rst
3f16d5c 
Co-authored-by: Zachary Moon <zmoon92@gmail.com>
@colin-harkins
Add more code literal markup
e890882
@colin-harkins
Update yaml.rst
333c329
@colin-harkins
Update yaml.rst
aee6def
@colin-harkins
Update yaml.rst
9e3b740
@colin-harkins
Merge pull request NOAA-CSL#169 from colin-harkins/develop_spelling
2c78198 
Fix spelling in yaml.rst
@zmoon
Increment dev version number
0861324
@colin-harkins
Merge new features from develop
3a0305d
rschwant
rschwant approved these changes Mar 16, 2023
View reviewed changes
Copy link
Collaborator

@rschwant rschwant left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, I agree that all of this should merge seamlessly.

@rschwant
Copy link
Collaborator

@mmarnold8 Maggie, Colin is merging the current develop branch into develop_aircraft, so once this happens you could include these updates for your tests with SABRE data.

@colin-harkins colin-harkins merged commit d016076 into NOAA-CSL:develop_aircraft Mar 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rschwant rschwant rschwant approved these changes

@zmoon zmoon Awaiting requested review from zmoon

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@colin-harkins @rschwant @zmoon @davidfillmore @dwfncar @mmarnold8 @mebruckner @jianheACM