bugfix #1706 fix PhaseDiagram use case to avoid writing into INPUT_BA…

…SE (#1709)
dtcenter · Jul 26, 2022 · 2dc00db · 2dc00db
1 parent 3b8dcdd
commit 2dc00db
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/jobs/get_metviewer.sh b/.github/jobs/get_metviewer.sh
@@ -24,7 +24,7 @@ docker ps -a
 
 # commands to run inside METviewer container
 cmd="mysql -hmysql_mv -uroot -pmvuser -e\"create database mv_metplus_test;\";"
-cmd+="mysql -hmysql_mv -uroot -pmvuser mv_metplus_test < /METviewer/sql/mv_mysql.sql"
+cmd+="mysql -hmysql_mv -uroot -pmvuser mv_metplus_test < /METviewer-python/METdataio/METdbLoad/sql/mv_mysql.sql"
 cmd+=";mysql -hmysql_mv -uroot -pmvuser -e\"show databases;\""
 
 # execute commands inside metviewer container to create database

diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.conf b/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.conf
@@ -50,7 +50,7 @@ FCST_RUN = False
 # Input and Output Directories for the OBS OLR Files and output text file containing the file list
 OBS_PDTIME_FMT = %Y%m%d-%H%M%S
 OBS_PDTIME_INPUT_TEMPLATE = {valid?fmt=%Y%m%d-%H%M%S}
-OBS_PDTIME_OUTPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/
+OBS_PDTIME_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/
 OBS_PDTIME_OUTPUT_TEMPLATE = time_list_lead{lead?fmt=%HHH}.txt
 
 
@@ -75,7 +75,7 @@ SCRIPT_OUTPUT_BASE = {OUTPUT_BASE}
 PLOT_INDEX = RMM
 
 # Input Directories
-OBS_PHASE_DIAGRAM_INPUT_DIR = {OBS_PDTIME_OUTPUT_DIR}
+OBS_PHASE_DIAGRAM_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram
 
 # Input filename template
 OBS_PHASE_DIAGRAM_INPUT_FILE = rmm.1x.txt

diff --git a/...ses/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/save_input_files_txt.py b/...ses/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/save_input_files_txt.py
@@ -6,6 +6,11 @@
 input_file = sys.argv[1]
 output_file = sys.argv[2]
 
+output_dir = os.path.dirname(output_file)
+if not os.path.exists(output_dir):
+    print(f'Creating output dir: {output_dir}')
+    os.makedirs(output_dir)
+
 filelist = open(output_file,'a+')
 filelist.write(input_file + '\n')
 filelist.close()