Skip to content

Commit

Permalink
Set up input data (#46)
Browse files Browse the repository at this point in the history
This PR adds a new `OM_data` class which is used by `plotObsMon.py `to
position the necessary data and control files required for a given plot.
This is more complex than it might seem because the legacy DA monitors
each handle their file naming uniquely. Additionally there are 4 data
directory formats supported. This includes the 3 that the legacy DA
monitor supports and a very simple structure which is only for use with
obs-monitor for development purposes. The directory structures are:

- obs-mon (development)
- glb-wkfl (global workflow output)
- gfs-ops (gfs operational output)
- leg-mon (legacy DA monitors internal storage)

Note that the `plotObsMon.py` is written in a fairly procedural manner.
That's on me, and perhaps made some sense when it was pretty simple but
I think it was more a matter of my habit than the right way to go about
things. This PR begins to change that -- the OM_data class is written in
an OO fashion and I do plan to update plotObsMon.py to make it more OO
in approach in another PR.

All the template files in `parm/templates` have been modified to make
the path to the required files simply `{{DATA}}`, removing the following
sub-directory (i.e. `{{DATA}}/rad_data/`). All the path extensions are
now handled by OM_data as part of the directory structure support
mentioned above.


Closes #45
  • Loading branch information
EdwardSafford-NOAA authored Oct 10, 2024
1 parent abb2564 commit dddc762
Show file tree
Hide file tree
Showing 15 changed files with 1,449 additions and 935 deletions.
173 changes: 148 additions & 25 deletions parm/gfs/gfs_plots.yaml

Large diffs are not rendered by default.

486 changes: 243 additions & 243 deletions parm/templates/conTime.yaml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions parm/templates/conVert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ datasets:
obstype: {{OBSTYPE}}
type: MonDataSpace
control_file:
- {{DATA}}/con_data/ges_{{OBSTYPE}}_stas.ctl
- {{DATA}}/ges_{{OBSTYPE}}_stas.ctl
filenames:
- {{DATA}}/con_data/ges_{{OBSTYPE}}_stas.{{ PDATE | to_YMDH }}
- {{DATA}}/ges_{{OBSTYPE}}_stas.{{ PDATE | to_YMDH }}

regions: 1

Expand All @@ -33,9 +33,9 @@ datasets:
obstype: {{OBSTYPE}}
type: MonDataSpace
control_file:
- {{DATA}}/con_data/anl_{{OBSTYPE}}_stas.ctl
- {{DATA}}/anl_{{OBSTYPE}}_stas.ctl
filenames:
- {{DATA}}/con_data/anl_{{OBSTYPE}}_stas.{{ PDATE | to_YMDH }}
- {{DATA}}/anl_{{OBSTYPE}}_stas.{{ PDATE | to_YMDH }}

regions: 1

Expand Down
58 changes: 29 additions & 29 deletions parm/templates/minGnormFourCycle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,35 @@ datasets:
control_file:
- {{CONTROL}}/minAllGnorm.ctl
filenames:
- {{DATA}}/min_data/{{ PDATE | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm6 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm12 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm18 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm24 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm30 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm36 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm42 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm48 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm54 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm60 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm66 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm72 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm78 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm84 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm90 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm96 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm102 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm108 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm114 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm120 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm126 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm132 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm138 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm144 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm150 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm156 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm162 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm168 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATE | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm6 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm12 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm18 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm24 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm30 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm36 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm42 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm48 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm54 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm60 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm66 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm72 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm78 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm84 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm90 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm96 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm102 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm108 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm114 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm120 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm126 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm132 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm138 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm144 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm150 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm156 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm162 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm168 | to_YMDH }}.gnorms.ieee_d

groups:
- name: GsiIeee
Expand Down
14 changes: 7 additions & 7 deletions parm/templates/minGnormOneCycle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ datasets:
control_file:
- {{CONTROL}}/minAllGnorm.ctl
filenames:
- {{DATA}}/min_data/{{ PDATE | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm24 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm48 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm72 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm96 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm120 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/min_data/{{ PDATEm144 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATE | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm24 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm48 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm72 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm96 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm120 | to_YMDH }}.gnorms.ieee_d
- {{DATA}}/{{ PDATEm144 | to_YMDH }}.gnorms.ieee_d

groups:
- name: GsiIeee
Expand Down
2 changes: 1 addition & 1 deletion parm/templates/minSummary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ datasets:
- name: gnorm
type: CsvSpace
filenames:
- {{DATA}}/min_data/gnorm_data.txt
- {{DATA}}/gnorm_data.txt
groups:
- name: GsiIeee
variables:
Expand Down
10 changes: 5 additions & 5 deletions parm/templates/oznHoriz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ datasets:

type: MonDataSpace
control_file:
- {{DATA}}/ozn_data/horiz/{{SENSOR}}_{{SAT}}.{{COMPONENT}}.ctl
- {{DATA}}/{{SENSOR}}_{{SAT}}.{{COMPONENT}}.ctl
filenames:
- {{DATA}}/ozn_data/horiz/{{SENSOR}}_{{SAT}}.{{COMPONENT}}.{{ PDATE | to_YMDH }}.ieee_d
- {{DATA}}/ozn_data/horiz/{{SENSOR}}_{{SAT}}.{{COMPONENT}}.{{ PDATEm6 | to_YMDH }}.ieee_d
- {{DATA}}/ozn_data/horiz/{{SENSOR}}_{{SAT}}.{{COMPONENT}}.{{ PDATEm12 | to_YMDH }}.ieee_d
- {{DATA}}/ozn_data/horiz/{{SENSOR}}_{{SAT}}.{{COMPONENT}}.{{ PDATEm18 | to_YMDH }}.ieee_d
- {{DATA}}/{{SENSOR}}_{{SAT}}.{{COMPONENT}}.{{ PDATE | to_YMDH }}.ieee_d
- {{DATA}}/{{SENSOR}}_{{SAT}}.{{COMPONENT}}.{{ PDATEm6 | to_YMDH }}.ieee_d
- {{DATA}}/{{SENSOR}}_{{SAT}}.{{COMPONENT}}.{{ PDATEm12 | to_YMDH }}.ieee_d
- {{DATA}}/{{SENSOR}}_{{SAT}}.{{COMPONENT}}.{{ PDATEm18 | to_YMDH }}.ieee_d
levels: {{LEVELS}}
groups:
- name: GsiIeee
Expand Down
Loading

0 comments on commit dddc762

Please sign in to comment.