Skip to content

Commit

Permalink
Merge pull request #235 from Breakthrough-Energy/ben/path
Browse files Browse the repository at this point in the history
Change paths to data folders and model
  • Loading branch information
rouille authored Jul 23, 2020
2 parents 2954f77 + 3d92c5c commit 8ca76b0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion powersimdata/scenario/create.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
)
)

Expand Down
2 changes: 1 addition & 1 deletion powersimdata/scenario/execute.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
18 changes: 10 additions & 8 deletions powersimdata/utility/const.py
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit 8ca76b0

Please sign in to comment.