Skip to content

Commit

Permalink
Fix os.path.joins in EnergyPlus workflow for EP-Launch
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonGlazer committed Sep 26, 2018
1 parent 569b6cc commit 8a9d67f
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions workflows/energyplus.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,11 @@ def run_energyplus(self, isIP, run_directory, file_name, args):

# run the ConvertESOMTR program to create IP versions of the timestep based output files
if platform.system() == 'Windows':
convertESOMTR_binary = os.path.join(energyplus_root_folder, 'PostProcess\\convertESOMTRpgm\\convertESOMTR.exe')
convertESOMTR_binary = os.path.join(energyplus_root_folder, 'PostProcess', 'convertESOMTRpgm', 'convertESOMTR.exe')
else:
convertESOMTR_binary = os.path.join(energyplus_root_folder, 'PostProcess\\convertESOMTRpgm\\convertESOMTR')
convertESOMTR_binary = os.path.join(energyplus_root_folder, 'PostProcess', 'convertESOMTRpgm', 'convertESOMTR')
if os.path.exists(convertESOMTR_binary):
converttxt_orig_path = os.path.join(energyplus_root_folder, 'PostProcess\\convertESOMTRpgm\\convert.txt')
converttxt_orig_path = os.path.join(energyplus_root_folder, 'PostProcess', 'convertESOMTRpgm', 'convert.txt')
converttxt_run_path = os.path.join(run_directory, 'convert.txt')
shutil.copy(converttxt_orig_path, converttxt_run_path)

Expand Down Expand Up @@ -229,9 +229,9 @@ def run_energyplus(self, isIP, run_directory, file_name, args):

# run ReadVarsESO to convert the timestep based output files to CSV files
if platform.system() == 'Windows':
readvarseso_binary = os.path.join(energyplus_root_folder, 'PostProcess\\ReadVarsESO.exe')
readvarseso_binary = os.path.join(energyplus_root_folder, 'PostProcess', 'ReadVarsESO.exe')
else:
readvarseso_binary = os.path.join(energyplus_root_folder, 'PostProcess\\ReadVarsESO')
readvarseso_binary = os.path.join(energyplus_root_folder, 'PostProcess', 'ReadVarsESO')
if os.path.exists(readvarseso_binary):

command_line_args = [readvarseso_binary]
Expand Down Expand Up @@ -316,9 +316,9 @@ def run_energyplus(self, isIP, run_directory, file_name, args):

# run HVAC-Diagram
if platform.system() == 'Windows':
hvac_diagram_binary = os.path.join(energyplus_root_folder, 'PostProcess\\HVAC-Diagram.exe')
hvac_diagram_binary = os.path.join(energyplus_root_folder, 'PostProcess', 'HVAC-Diagram.exe')
else:
hvac_diagram_binary = os.path.join(energyplus_root_folder, 'PostProcess\\HVAC-Diagram')
hvac_diagram_binary = os.path.join(energyplus_root_folder, 'PostProcess', 'HVAC-Diagram')
if os.path.exists(hvac_diagram_binary):
bnd_path = os.path.join(run_directory, file_name_no_ext + '.bnd')
eplusout_bnd_path = os.path.join(run_directory, 'eplusout.bnd')
Expand Down

8 comments on commit 8a9d67f

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EPLaunch-FixOsPathJoins (JasonGlazer) - i386-Windows-7-VisualStudio-14: OK (3037 of 3037 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EPLaunch-FixOsPathJoins (JasonGlazer) - x86_64-MacOS-10.9-clang: OK (3037 of 3037 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EPLaunch-FixOsPathJoins (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8: OK (3077 of 3077 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EPLaunch-FixOsPathJoins (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EPLaunch-FixOsPathJoins (JasonGlazer) - Win64-Windows-7-VisualStudio-14: OK (3037 of 3037 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EPLaunch-FixOsPathJoins (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (1773 of 1773 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EPLaunch-FixOsPathJoins (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (2409 of 2409 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EPLaunch-FixOsPathJoins (JasonGlazer) - x86_64-Linux-Ubuntu-14.04-custom_check: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

Please sign in to comment.