Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tabs before equals in equation #222

Merged
merged 4 commits into from
Jan 13, 2025
Merged

Tabs before equals in equation #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffa7e64
Be more robust with regards of equation formatting when replacing par…
zuckerruebe Jan 13, 2025
fe29b84
Add test.
zuckerruebe Jan 13, 2025
efc164c
Remove unused `pytest.mark`.
zuckerruebe Jan 13, 2025
7d92ee6
Satisfy static checkers.
zuckerruebe Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pytrnsys/trnsys_util/deckTrnsys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ def changeParameter(self, _parameters):
pass

try:
myName = splitEquality[0].replace(" ", "")
myName = re.sub(r"[ \t]+", "", splitEquality[0])

for key in self.parameters.keys():
if key.lower() == myName.lower(): # avoid case-sensitive
Expand Down
10 changes: 5 additions & 5 deletions ...im/data/expected/pytrnsysRun.dck.template → ..._Plural/expected/pytrnsysRun.dck.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ LAMWAT = 0.58 ! heat conductivity W/(mK)
CPWAT_SI = CPWAT*1000 ! J/(kgK)
CPBRI_SI = CPBRI*1000 ! J/(kgK)
**********************************************************************
** Building_4Study.ddck from $PYTRNSYS_FOLDER\tests\pytrnsys\rsim\data\input\05_pytrnsys_Files
** Building_4Study.ddck from $INPUT_FOLDER\05_pytrnsys_Files
**********************************************************************
*******************************
**BEGIN Building_4Study.ddck
Expand Down Expand Up @@ -1765,7 +1765,7 @@ Temperatures
Nix
Nix
**********************************************************************
** weather_data_base_2.ddck from $PYTRNSYS_FOLDER\tests\pytrnsys\rsim\data\input\05_pytrnsys_Files
** weather_data_base_2.ddck from $INPUT_FOLDER\05_pytrnsys_Files
**********************************************************************
*******************************
**BEGIN WeatherData.dck
Expand Down Expand Up @@ -2048,7 +2048,7 @@ INPUTS 6
Time Tamb one IT_H_KW IB_H_kW IT_surfUser_1_Wm2
Time Tamb hoursInMonth IT_H_KW IB_H_kW IT_surfUser_1_Wm2
**********************************************************************
** Type_985.ddck from $PYTRNSYS_FOLDER\tests\pytrnsys\rsim\data\input\05_pytrnsys_Files
** Type_985.ddck from $INPUT_FOLDER\05_pytrnsys_Files
**********************************************************************
*******************************
**BEGIN Type_985.ddck
Expand Down Expand Up @@ -2081,7 +2081,7 @@ w ! 15 thickness of the walls around the floor in contact with the grou
RGrTot ! 16 total thermal resistance of floor
Psi ! 17 Linear thermal transmittance
**********************************************************************
** Ground_properties.ddck from $PYTRNSYS_FOLDER\tests\pytrnsys\rsim\data\input\05_pytrnsys_Files
** Ground_properties.ddck from $INPUT_FOLDER\05_pytrnsys_Files
**********************************************************************
*******************************
**BEGIN Ground_properties.ddck
Expand All @@ -2092,7 +2092,7 @@ RhoGrd = 2500 ! 5 density of the ground [kg/m3]
CpGrd = 0.8 ! 6 heat capacity of the ground [kJ/kgK]
Gt = 0.025 ! 7 geothermal gradient [K/m]
**********************************************************************
** Kasava_hour.ddck from $PYTRNSYS_FOLDER\tests\pytrnsys\rsim\data\input\05_pytrnsys_Files\01_Weather_Data
** Kasava_hour.ddck from $INPUT_FOLDER\05_pytrnsys_Files\01_Weather_Data
**********************************************************************
*******************************
**BEGIN Kasava_hour.ddck
Expand Down
0 ...m/data/input/02_Model/Building_4Study.b18 → ...Plural/input/02_Model/Building_4Study.b18
View file
Open in desktop
File renamed without changes.
0 ...nsys_Files/01_Weather_Data/Kasava_hour.99 → ...nsys_Files/01_Weather_Data/Kasava_hour.99
View file
Open in desktop
File renamed without changes.
0 ...ys_Files/01_Weather_Data/Kasava_hour.ddck → ...ys_Files/01_Weather_Data/Kasava_hour.ddck
View file
Open in desktop
File renamed without changes.
0 ...sys_Files/Building_4Study.config.template → ...sys_Files/Building_4Study.config.template
View file
Open in desktop
File renamed without changes.
0 ...ut/05_pytrnsys_Files/Building_4Study.ddck → ...ut/05_pytrnsys_Files/Building_4Study.ddck
View file
Open in desktop
File renamed without changes.
0 .../05_pytrnsys_Files/Ground_properties.ddck → .../05_pytrnsys_Files/Ground_properties.ddck
View file
Open in desktop
File renamed without changes.
0 ...ata/input/05_pytrnsys_Files/Type_985.ddck → ...ral/input/05_pytrnsys_Files/Type_985.ddck
View file
Open in desktop
File renamed without changes.
0 ...5_pytrnsys_Files/weather_data_base_2.ddck → ...5_pytrnsys_Files/weather_data_base_2.ddck
View file
Open in desktop
File renamed without changes.
Loading