From 7a2c6170a9c8533539e0b0eb6efb98cc9c1cff59 Mon Sep 17 00:00:00 2001 From: Ben RdO Date: Thu, 23 Jul 2020 14:27:38 -0700 Subject: [PATCH 1/3] chore: change and add paths (#234) --- powersimdata/utility/const.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/powersimdata/utility/const.py b/powersimdata/utility/const.py index 37ce0ee48..f9351496d 100644 --- a/powersimdata/utility/const.py +++ b/powersimdata/utility/const.py @@ -1,12 +1,14 @@ import os +import posixpath from pathlib import Path -SERVER_ADDRESS = "zeus.intvenlab.com" -HOME_DIR = "/home/EGM/v2" -SCENARIO_LIST = "/home/EGM/v2/ScenarioList.csv" -EXECUTE_LIST = "/home/EGM/v2/ExecuteList.csv" -EXECUTE_DIR = "/home/EGM/v2/tmp" -BASE_PROFILE_DIR = "/home/EGM/v2/raw" -INPUT_DIR = "/home/EGM/v2/data/input" -OUTPUT_DIR = "/home/EGM/v2/data/output" +SERVER_ADDRESS = "becompute01.gatesventures.com" +DATA_ROOT_DIR = "/mnt/bes/pcm" +SCENARIO_LIST = posixpath.join(DATA_ROOT_DIR, "ScenarioList.csv") +EXECUTE_LIST = posixpath.join(DATA_ROOT_DIR, "ExecuteList.csv") +EXECUTE_DIR = posixpath.join(DATA_ROOT_DIR, "tmp") +BASE_PROFILE_DIR = posixpath.join(DATA_ROOT_DIR, "raw") +INPUT_DIR = posixpath.join(DATA_ROOT_DIR, "data/input") +OUTPUT_DIR = posixpath.join(DATA_ROOT_DIR, "data/output") LOCAL_DIR = os.path.join(str(Path.home()), "ScenarioData", "") +MODEL_DIR = "/home/bes/pcm" From 4b085a697ec78ba77b24b611c1b46deaec7e55f6 Mon Sep 17 00:00:00 2001 From: Ben RdO Date: Thu, 23 Jul 2020 14:28:28 -0700 Subject: [PATCH 2/3] refactor: update path to model --- powersimdata/scenario/execute.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powersimdata/scenario/execute.py b/powersimdata/scenario/execute.py index a292282a4..15e950c6a 100644 --- a/powersimdata/scenario/execute.py +++ b/powersimdata/scenario/execute.py @@ -115,7 +115,7 @@ def _run_script(self, script): :param str script: script to be used. :return: (*subprocess.Popen*) -- process used to run script """ - path_to_package = posixpath.join(const.HOME_DIR, self._scenario_info["engine"]) + path_to_package = posixpath.join(const.MODEL_DIR, self._scenario_info["engine"]) if self._scenario_info["engine"] == "REISE": folder = "pyreise" else: From 3d92c5cd1a419ba595cf9207517216a80e0c41ea Mon Sep 17 00:00:00 2001 From: Ben RdO Date: Thu, 23 Jul 2020 15:37:50 -0700 Subject: [PATCH 3/3] refactor: update path to data directory --- powersimdata/scenario/create.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powersimdata/scenario/create.py b/powersimdata/scenario/create.py index 4826d803d..860e96c0e 100644 --- a/powersimdata/scenario/create.py +++ b/powersimdata/scenario/create.py @@ -85,7 +85,7 @@ def _generate_scenario_id(self): % ( const.SCENARIO_LIST, const.SCENARIO_LIST, - posixpath.join(const.HOME_DIR, "scenario.lockfile"), + posixpath.join(const.DATA_ROOT_DIR, "scenario.lockfile"), ) )