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

Feature/cam ptype #158

Merged
merged 66 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
d2f7436
Added workflow for cam plotting
Dec 2, 2022
995fe01
full plotting scripts integrated into cam plots workflow
Dec 2, 2022
57a95d5
Fix typos and syntax errors + use COMIN for input stats
Dec 2, 2022
e086f20
Merge branch 'feature/CAM_grid2obs_priority' into feature/CAM_plotting
Dec 2, 2022
62d1945
Adjust settings and minor bug fixes
Dec 6, 2022
28a74ca
Improve plotting logic for unit conversion, fix bugs
Dec 9, 2022
b65cc64
Merge branch 'develop' into feature/CAM_plotting
Dec 9, 2022
d554ec8
changed filename structure and unit conversion logic + removed hpbl v…
Dec 14, 2022
423e629
Fixed minor bugs + changed version and HOMEevs directory for test runs
Dec 15, 2022
b12ea32
fix minor bugs preventing successful runs + update module versions an…
Dec 16, 2022
a712292
Merge develop
Jan 10, 2023
9bbb2c2
Add NBRCNT, INTERP_PNTS, and FSS capability
Jan 19, 2023
0a60498
Add and adapt global_det precip spatial map plotting scripts to CAM d…
Jan 26, 2023
e4a2a8f
Add capability to plot MRMS + lon sanitization + minor edits to plot …
Jan 27, 2023
b954896
add pr and hi jobs to PCPCombine job type
Jan 27, 2023
0f3d66f
Edit workflows for hiresws to include pr and hi pcp_combine jobs + in…
Jan 31, 2023
3c663d0
fix precip plot failure + finish spatial map code + minor bugfixes
Feb 1, 2023
f6696e0
Fix minor bugs causing errors that prevent CAM_plotting and CAM_preci…
Feb 2, 2023
ca67f4b
Change vx_mask strings used for setting map extent
Feb 2, 2023
e6d0afe
Fix final errors in spatial mapping code + reset VDATE to ops setting…
Feb 3, 2023
424b05d
Merge branch 'develop' into feature/CAM_plotting
Feb 3, 2023
59459e6
Fix I/O Errors due to printing + use vx masking region names that mat…
Feb 9, 2023
8154e3a
Fix broken level-naming when mrms is verif_type
Feb 9, 2023
3358e74
fix var savename for precip graphics + adjust graphics needs + fix st…
Feb 13, 2023
b0bc99b
Catch empty confidence intervals errors + adjust graphics definitions
Feb 16, 2023
b764212
Merge branch 'develop' into feature/CAM_plotting
Feb 16, 2023
516653e
Add top-level cartopy shapefiles directory definition, referencing th…
Feb 16, 2023
b23b5a1
First commit
Feb 28, 2023
a49ec75
Complete PTYPE workflow for METAR verif_type
Mar 7, 2023
51e2a76
merge develop
Mar 7, 2023
5c33487
Complete prep workflow for mping downloading jobs
Mar 9, 2023
346f8fc
Complete stats workflow for the mping verif_type
Mar 9, 2023
4af3a44
Finished ptype/mping stats and developed ptype plotting workflow
Mar 15, 2023
ce5246a
Adjust performance diagram settings for ptype jobs
Mar 17, 2023
d9b0664
Added SKIP_IF_OUTPUT_EXISTS env var to allow 'no' option for spc_otlk…
Mar 21, 2023
af4fc92
change SKIP_IF_OUTPUT_EXISTS configurations for the hrrr
Mar 21, 2023
83b747c
Merge develop
Mar 22, 2023
8d3834c
Add maillist capability
Apr 5, 2023
e5c561b
Merge develop
Apr 5, 2023
35fe9bf
Merge develop
Apr 6, 2023
35d4dfd
Added capability to connect mismatched data points
Apr 7, 2023
f697069
Add mail capability to J-job
Apr 14, 2023
03bd9f0
Remove __pycache__ directory
Apr 14, 2023
abef1c4
Merge branch 'develop' into feature/CAM_ptype
Apr 14, 2023
8b0a7df
Minor changes to mail message code
Apr 20, 2023
70ab2b5
Merge branch 'develop' into feature/CAM_ptype
Apr 20, 2023
5d04394
Merge feature/CAM_ptype with develop
Apr 24, 2023
17da60f
Change HOMEevs directory path for testing
Apr 24, 2023
72e4646
updated run.ver, changed spc_otlk input to already-preprocessed masks…
May 24, 2023
f8b0473
merge develop
May 25, 2023
757fef7
Use updated run.ver and the EVS venv + add configs needed for cam hea…
Jun 12, 2023
bd6fb54
Merge develop
Jun 12, 2023
136d83c
Merge branch 'develop' into feature/CAM_ptype
Jul 3, 2023
949b13f
Modify DATA directory and some HOMEevs definitions
Jul 5, 2023
01a39e9
Changed module loading + added MCTC to StatAnalysis + changed Alaska …
Jul 10, 2023
dc4c24b
change HOMEevs to noscrub
Jul 10, 2023
baa2325
Merge develop
Jul 10, 2023
383c81a
Change vis and ceiling threshold operands to lt
Jul 10, 2023
94f8626
allow for preset level lists and lists of level lists
Jul 11, 2023
9c9f554
Add level presets
Jul 13, 2023
5315d74
Aggregate cycles used in vhrmean plots
Jul 13, 2023
7332914
Merge develop
Jul 14, 2023
d1777f7
Add capability to define and use COMOUTplots directory + change plots…
Jul 21, 2023
2ef618f
Add check for COMOUTplots variable and correct mkdir definition to us…
Jul 21, 2023
8c04060
Merge branch 'develop' into feature/CAM_ptype
Jul 24, 2023
c55aecf
Point COMINspcotlk back to USER space
Jul 24, 2023
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
Fix broken level-naming when mrms is verif_type
  • Loading branch information
marcel caron committed Feb 9, 2023
commit 8154e3a42da252e5e7ebba8587028d9b78303808
6 changes: 5 additions & 1 deletion ush/cam/lead_average.py
Original file line number Diff line number Diff line change
Expand Up @@ -1081,9 +1081,13 @@ def plot_lead_average(df: pd.DataFrame, logger: logging.Logger,
else:
level_string = f'{level_num}-m '
level_savename = f'{level}'
elif 'L' in str(level) or 'A' in str(level):
elif 'L' in str(level):
level_string = ''
level_savename = f'{level}'
elif 'A' in str(level):
level_num = level.replace('A', '')
level_string = f'{level_num}-hour '
level_savename = f'A{level_num.zfill(2)}'
else:
level_string = f'{level} '
level_savename = f'{level}'
Expand Down
6 changes: 5 additions & 1 deletion ush/cam/performance_diagram.py
Original file line number Diff line number Diff line change
Expand Up @@ -931,9 +931,13 @@ def plot_performance_diagram(df: pd.DataFrame, logger: logging.Logger,
else:
level_string = f'{level_num}-m '
level_savename = f'{level}'
elif 'L' in str(level) or 'A' in str(level):
elif 'L' in str(level):
level_string = ''
level_savename = f'{level}'
elif 'A' in str(level):
level_num = level.replace('A', '')
level_string = f'{level_num}-hour '
level_savename = f'A{level_num.zfill(2)}'
else:
level_string = f'{level} '
level_savename = f'{level}'
Expand Down
10 changes: 7 additions & 3 deletions ush/cam/threshold_average.py
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,7 @@ def plot_threshold_average(df: pd.DataFrame, logger: logging.Logger,
date_start_string = date_range[0].strftime('%d %b %Y')
date_end_string = date_range[1].strftime('%d %b %Y')
metric_string = metric_long_name
print(level)
if str(level).upper() in ['CEILING', 'TOTAL', 'PBL']:
if str(level).upper() == 'CEILING':
level_string = ''
Expand All @@ -773,7 +774,7 @@ def plot_threshold_average(df: pd.DataFrame, logger: logging.Logger,
else:
level_string = ''
level_savename = f'{level}'
elif str(verif_type).lower() in ['sfc', 'conus_sfc', 'polar_sfc', 'mrms','metar']:
elif str(verif_type).lower() in ['sfc', 'conus_sfc', 'polar_sfc', 'mrms', 'metar']:
if 'Z' in str(level):
if str(level).upper() == 'Z0':
if str(var_long_name_key).upper() in ['MLSP', 'MSLET', 'MSLMA', 'PRMSL']:
Expand All @@ -790,10 +791,13 @@ def plot_threshold_average(df: pd.DataFrame, logger: logging.Logger,
else:
level_string = f'{level_num}-m '
level_savename = f'{level}'
elif 'L' in str(level) or 'A' in str(level):
elif 'L' in str(level):
level_string = ''
level_savename = f'{level}'

elif 'A' in str(level):
level_num = level.replace('A', '')
level_string = f'{level_num}-hour '
level_savename = f'A{level_num.zfill(2)}'
else:
level_string = f'{level} '
level_savename = f'{level}'
Expand Down
6 changes: 5 additions & 1 deletion ush/cam/valid_hour_average.py
Original file line number Diff line number Diff line change
Expand Up @@ -1072,9 +1072,13 @@ def plot_valid_hour_average(df: pd.DataFrame, logger: logging.Logger,
else:
level_string = f'{level_num}-m '
level_savename = f'{level}'
elif 'L' in str(level) or 'A' in str(level):
elif 'L' in str(level):
level_string = ''
level_savename = f'{level}'
elif 'A' in str(level):
level_num = level.replace('A', '')
level_string = f'{level_num}-hour '
level_savename = f'A{level_num.zfill(2)}'
else:
level_string = f'{level} '
level_savename = f'{level}'
Expand Down