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 892 rmm omi tests #1038

Merged
merged 82 commits into from
Jul 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
a3006fb
Updated driver scripts
May 11, 2021
c8e448b
Added more information to the scripts
May 20, 2021
fe2104f
Updates to RMM and OMI drivers, added phase diagram driver
Jun 7, 2021
ceaf51f
Updates to phase diagram driver
Jun 7, 2021
6a79d27
Fixed a bug in the util script
Jun 9, 2021
01c8b90
Updated Phase Diagram Driver
Jun 10, 2021
294b0ce
Updated plotting paths
Jun 10, 2021
b71c791
A bit of branch cleanup
Jun 10, 2021
56d04bb
Some branch cleanup
Jun 10, 2021
2e18288
Additional parameters to run_omi_step() function, modified import
Jun 11, 2021
9fe9a2e
Github issue #892 initial version (incomplete) for the RMM plot use
Jun 16, 2021
20b46de
Github Issue #892 Initial (incomplete) documentation for OMI plotting…
Jun 16, 2021
82e1002
Delete UserScript_fcstGFS_obsERA_OMI.py
bikegeek Jun 16, 2021
013a1b8
Update UserScript_fcstGFS_obsERA_RMM.py
bikegeek Jun 16, 2021
751ccbd
Update UserScript_fcstGFS_obsERA_RMM.py
bikegeek Jun 16, 2021
185e2bb
Delete UserScript_fcstGFS_obsERA_RMM.py
bikegeek Jun 16, 2021
bb46699
Delete OMI_driver.py
CPKalb Jun 17, 2021
3e148d6
Add files via upload
CPKalb Jun 17, 2021
bfa0aaf
Delete UserScript_fcstGFS_obsERA_OMI.conf
CPKalb Jun 17, 2021
94bc8c7
Add files via upload
CPKalb Jun 17, 2021
8a34a25
Delete OMI_driver.py
CPKalb Jun 17, 2021
deff0cd
Add files via upload
CPKalb Jun 17, 2021
ed3caf7
Github #892 initial work on documentation for RMM use case
Jun 18, 2021
d0a3099
Github Issue #892 initial OMI documentation (incomplete)
Jun 18, 2021
824eea7
Delete OMI_driver.py
CPKalb Jun 19, 2021
2857f55
Delete compute_mjo_indices.py
CPKalb Jun 19, 2021
b14802a
Delete RMM_OMI_util.py
CPKalb Jun 19, 2021
89447d3
Delete RMM_driver.py
CPKalb Jun 19, 2021
3186f0d
Delete UserScript_fcstGFS_obsERA_RMM.conf
CPKalb Jun 19, 2021
acc7802
Delete UserScript_fcstGFS_obsERA_OMI.conf
CPKalb Jun 19, 2021
776e872
Delete RMM_OMI_util.py
CPKalb Jun 19, 2021
ec80ca3
Add files via upload
CPKalb Jun 19, 2021
7624727
Add files via upload
CPKalb Jun 19, 2021
90eb104
Rename parm/use_cases/model_applications/s2s/OMI_driver.py to parm/us…
CPKalb Jun 19, 2021
5276c88
Rename parm/use_cases/model_applications/s2s/RMM_driver.py to parm/us…
CPKalb Jun 19, 2021
8129701
Rename parm/use_cases/model_applications/s2s/RMM_OMI_util.py to parm/…
CPKalb Jun 19, 2021
953a840
Updated RMM Driver
Jun 19, 2021
4fa3b7b
updates to OMI driver
Jun 19, 2021
9416932
Cleanup to OMI_driver
Jun 25, 2021
ca4a18a
Updates to RMM driver
Jun 25, 2021
470c72a
Updates to RMM driver
Jun 25, 2021
fdc53a6
Cleanup to Phase Diagram Driver
Jun 25, 2021
f842fed
Updates to Phase Diagram Driver
Jun 25, 2021
9e763f7
Cleanup to RMM and OMI drivers
Jun 26, 2021
c4277c7
Updates to Phase Diagram Driver
Jun 26, 2021
fd66529
Updates to Phase Diagram Driver
Jun 26, 2021
900cc03
Cleanup to OMI driver
Jun 27, 2021
cf786f7
Fixed a bug in the OMI driver
Jun 27, 2021
4ed1e6a
Removed something that wasn't working
Jun 27, 2021
1cfff2f
Fixed a string/bool problem
Jun 27, 2021
a009b8b
Updated documentation for the use case
Jun 29, 2021
abb872b
Updated RMM documentation
Jun 29, 2021
3def802
Updates to RMM documentation
Jun 30, 2021
c015105
Add normalization factors as inputs
Jun 30, 2021
2adec58
Pass in the rmm_norm and pc_norm to compute_mjo_indices' rmm() function
Jun 30, 2021
aab22db
Added phase diagram documentation
Jul 1, 2021
27e50fc
Updated phase diagram documentation
Jul 1, 2021
702baa5
Corrected a path
Jul 1, 2021
6f843c5
Fixed plot typo
Jul 1, 2021
5dd2158
Modified OMI use case to use read_netcdf
Jul 14, 2021
22d6bf2
Removed fisherh customizations
Jul 14, 2021
f5d7ab7
Concatenated all data into one xarray
Jul 19, 2021
9c2f2ed
Added some changes for dbload
Jul 21, 2021
0ebbd36
Updates so that I can incorporate file listing logic from 1002
Jul 21, 2021
9a58ee7
Merge branch 'develop' into feature_892_RMM_OMI_drivers
Jul 21, 2021
5405dde
Converted to use new METplus file input
Jul 21, 2021
c223011
Updates to documentation
Jul 21, 2021
4b57c3a
Added OMI to use cases
Jul 21, 2021
d48ddc9
Merge branch 'develop' into feature_892_RMM_OMI_drivers
georgemccabe Jul 21, 2021
22fbfd4
added new use case to tests
georgemccabe Jul 21, 2021
09b9bc4
merged develop and resolved conflicts
georgemccabe Jul 22, 2021
582c3dc
add new use cases to tests
georgemccabe Jul 22, 2021
3067f25
split up 3 new use cases into 3 separate jobs to more easily debug er…
georgemccabe Jul 22, 2021
7274efe
set python path for metdatadb so files can be imported by new use cases
georgemccabe Jul 22, 2021
7f56abd
added metdatadb to use cases that need access to functions from that …
georgemccabe Jul 22, 2021
8c6a88e
Merge branch 'develop' into feature_892_RMM_OMI_tests
georgemccabe Jul 22, 2021
bea977f
install METdatadb package instead of adding to PYTHONPATH to test tha…
georgemccabe Jul 22, 2021
c552453
check python3 version used
georgemccabe Jul 22, 2021
b6b689e
removed which command
georgemccabe Jul 22, 2021
6e7d5ff
Merge branch 'develop' into feature_892_RMM_OMI_tests
georgemccabe Jul 26, 2021
42a8b37
regrouped use cases and marked them as not new in preparation for pul…
georgemccabe Jul 26, 2021
a9c075c
Merge branch 'develop' into feature_892_RMM_OMI_tests
georgemccabe Jul 27, 2021
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
1 change: 1 addition & 0 deletions .github/jobs/get_use_case_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ def handle_automation_env(host_name, reqs, work_dir):
f'cd {METPLUS_DOCKER_LOC};'
f'{work_dir}/manage_externals/checkout_externals'
f' -e {work_dir}/.github/parm/Externals_metdatadb.cfg;'
f'{python_path} -m pip install {METPLUS_DOCKER_LOC}/../METdatadb;'
'cd -;'
)

Expand Down
7 changes: 6 additions & 1 deletion .github/parm/use_case_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,12 @@
},
{
"category": "s2s",
"index_list": "6",
"index_list": "6-7",
"new": false
},
{
"category": "s2s",
"index_list": "8-9",
"new": false
},
{
Expand Down
4 changes: 3 additions & 1 deletion internal_tests/use_cases/all_use_cases.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ Category: s2s
4::TCGen_fcstGFSO_obsBDECKS_GDF_TDF:: model_applications/s2s/TCGen_fcstGFSO_obsBDECKS_GDF_TDF.conf:: metplotpy_env,metplus
5::UserScript_obsPrecip_obsOnly_Hovmoeller:: model_applications/s2s/UserScript_obsPrecip_obsOnly_Hovmoeller.conf:: metplotpy_env
6:: UserScript_obsPrecip_obsOnly_CrossSpectraPlot:: model_applications/s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot.conf:: spacetime_env
7:: UserScript_fcstGFS_obsERA_OMI:: model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.conf:: spacetime_env
7:: UserScript_fcstGFS_obsERA_PhaseDiagram:: model_applications/s2s/UserScript_fcstGFS_obsERA_PhaseDiagram.conf:: spacetime_env
8:: UserScript_fcstGFS_obsERA_OMI:: model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.conf:: spacetime_env, metdatadb
9:: UserScript_fcstGFS_obsERA_RMM:: model_applications/s2s/UserScript_fcstGFS_obsERA_RMM.conf:: spacetime_env, metdatadb


Category: space_weather
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ def run_omi_steps(inlabel, olr_filetxt, spd, EOF1, EOF2, oplot_dir):
olr_input_files = olr_input_files[1:]

# Read in the netCDF data from a list of files

netcdf_reader = read_netcdf.ReadNetCDF()
ds_orig = netcdf_reader.read_into_xarray(olr_input_files)

Expand Down