From 20c6eec5b782313bc16dc284afd58ba4303e4f03 Mon Sep 17 00:00:00 2001 From: msouff Date: Mon, 1 Jun 2020 09:44:39 -0600 Subject: [PATCH] added era5 variable to plain_table_task.ecf --- ecflow/run_rapid.def | 4 ++-- ecflow/run_rapid.py | 4 ++-- ecflow/run_rapid/plain_table_task.ecf | 2 +- ecflow/spt_extract_plain_table.py | 4 +++- ecflow_era/run_rapid_era.def | 4 ++-- ecflow_era/run_rapid_era.py | 4 ++-- run_seasonal_qinit.py | 7 +++---- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ecflow/run_rapid.def b/ecflow/run_rapid.def index d2320f4..b6434c6 100644 --- a/ecflow/run_rapid.def +++ b/ecflow/run_rapid.def @@ -5,7 +5,7 @@ suite run_rapid edit ECF_HOME '/home/michael/host_share/rapid_run/ecflow' task prep_task edit PYSCRIPT '/home/michael/host_share/rapid_run/ecflow/iprep_ecf.py' - edit IO_LOCATION '/home/michael/host_share/rapid-io_init' + edit IO_LOCATION '/home/michael/host_share/japan-io' edit RUNOFF_LOCATION '/home/michael/host_share/ecmwf' family ensemble_family trigger prep_task == complete @@ -172,7 +172,7 @@ suite run_rapid task plain_table_task trigger ensemble_family == complete edit PYSCRIPT '/home/michael/host_share/rapid_run/ecflow/spt_extract_plain_table.py' - edit OUT_LOCATION '/home/michael/host_share/rapid-io_init/output' + edit OUT_LOCATION '/home/michael/host_share/japan-io/output' edit LOG_FILE '/home/michael/host_share/rapid_run/ecflow/run_rapid/ecf_out/plain_table.log' edit NCES_EXEC '/home/michael/miniconda3/envs/ecflow/bin/nces' endsuite diff --git a/ecflow/run_rapid.py b/ecflow/run_rapid.py index 02b98d7..a15d804 100644 --- a/ecflow/run_rapid.py +++ b/ecflow/run_rapid.py @@ -37,7 +37,7 @@ def create_ensemble_family(): prep_task = suite.add_task('prep_task') prep_task.add_variable("PYSCRIPT", os.path.join(home, 'iprep_ecf.py')) -prep_task.add_variable("IO_LOCATION", "/home/michael/host_share/rapid-io_init") +prep_task.add_variable("IO_LOCATION", "/home/michael/host_share/japan-io") prep_task.add_variable("RUNOFF_LOCATION", "/home/michael/host_share/ecmwf") suite += create_ensemble_family() @@ -45,7 +45,7 @@ def create_ensemble_family(): plain_table_task = suite.add_task('plain_table_task') plain_table_task.add_trigger("ensemble_family == complete") plain_table_task.add_variable("PYSCRIPT", os.path.join(home, 'spt_extract_plain_table.py')) -plain_table_task.add_variable("OUT_LOCATION", "/home/michael/host_share/rapid-io_init/output") +plain_table_task.add_variable("OUT_LOCATION", "/home/michael/host_share/japan-io/output") plain_table_task.add_variable("LOG_FILE", os.path.join(home, 'run_rapid/ecf_out/plain_table.log')) plain_table_task.add_variable("NCES_EXEC", "/home/michael/miniconda3/envs/ecflow/bin/nces") diff --git a/ecflow/run_rapid/plain_table_task.ecf b/ecflow/run_rapid/plain_table_task.ecf index 4aecb22..a2603b1 100644 --- a/ecflow/run_rapid/plain_table_task.ecf +++ b/ecflow/run_rapid/plain_table_task.ecf @@ -1,3 +1,3 @@ %include -/usr/bin/python3.6 %PYSCRIPT% %OUT_LOCATION% %LOG_FILE% %NCES_EXEC% +/usr/bin/python3.6 %PYSCRIPT% %OUT_LOCATION% %LOG_FILE% %NCES_EXEC% era5 %include \ No newline at end of file diff --git a/ecflow/spt_extract_plain_table.py b/ecflow/spt_extract_plain_table.py index 0900f4b..e2e44ea 100644 --- a/ecflow/spt_extract_plain_table.py +++ b/ecflow/spt_extract_plain_table.py @@ -12,6 +12,7 @@ ################################################################# import os +from glob import glob import sys import multiprocessing as mp import subprocess as sp @@ -43,7 +44,8 @@ def extract_summary_table(workspace): file_name = 'summary_table_{0}_{1}.csv'.format(full_name, date_string) # creating pandas dataframe with return periods - rp_path = os.path.join(os.path.split(workspace)[0], 'return_periods_erai_t511_24hr_20100101to20141231.nc') + era_type = str(sys.argv[4]) + rp_path = glob(os.path.join(os.path.split(workspace)[0], f'return_periods_{era_type}*.nc'))[0] rp_ncfile = nc.Dataset(rp_path, 'r') # extract values diff --git a/ecflow_era/run_rapid_era.def b/ecflow_era/run_rapid_era.def index a9b0d9e..f92a664 100644 --- a/ecflow_era/run_rapid_era.def +++ b/ecflow_era/run_rapid_era.def @@ -6,7 +6,7 @@ suite run_rapid_era task era_task edit PYSCRIPT '/home/michael/host_share/rapid_run/ecflow_era/run_lsm.py' edit RAPID_EXEC '/home/michael/rapid/run/rapid' - edit IO_LOCATION '/home/michael/host_share/rapid-io_init' - edit ERA_LOCATION '/home/michael/host_share/era_data' + edit IO_LOCATION '/home/michael/host_share/japan-io' + edit ERA_LOCATION '/home/michael/host_share/era5_data/era5_runoff_2001to2015' endsuite # enddef diff --git a/ecflow_era/run_rapid_era.py b/ecflow_era/run_rapid_era.py index 09c59a2..30c6ebe 100644 --- a/ecflow_era/run_rapid_era.py +++ b/ecflow_era/run_rapid_era.py @@ -15,8 +15,8 @@ prep_task = suite.add_task('era_task') prep_task.add_variable("PYSCRIPT", os.path.join(home, 'run_lsm.py')) prep_task.add_variable("RAPID_EXEC", '/home/michael/rapid/run/rapid') -prep_task.add_variable("IO_LOCATION", "/home/michael/host_share/rapid-io_init") -prep_task.add_variable("ERA_LOCATION", "/home/michael/host_share/era_data") +prep_task.add_variable("IO_LOCATION", "/home/michael/host_share/japan-io") +prep_task.add_variable("ERA_LOCATION", "/home/michael/host_share/era5_data/era5_runoff_2001to2015") print(defs) diff --git a/run_seasonal_qinit.py b/run_seasonal_qinit.py index f5d8daf..200af9c 100644 --- a/run_seasonal_qinit.py +++ b/run_seasonal_qinit.py @@ -5,15 +5,14 @@ @author: michael """ +from RAPIDpy.rapid import RAPID + qout = '/home/michael/host_share/rapid-io/output' \ '/south_america-col_negro_b' \ '/Qout_erai_t511_24hr_19800101to19961231.nc' connt = '/home/michael/host_share/rapid-io/input' \ '/south_america-col_negro_b/rapid_connect.csv' - - - -from RAPIDpy.rapid import RAPID + rapid_manager = RAPID( Qout_file=qout, rapid_connect_file=connt