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.

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

Issue3327 spawn pthp development #3328

Open
wants to merge 257 commits into
base: issue3327_SPAWN_PTHdevelopment
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
257 commits
Select commit Hold shift + click to select a range
41fb676
Added validation script for simulating and plotting
karthikeyad-pnnl Jun 1, 2022
e01cbf7
Merge pull request #1 from lbl-srg/master
SenHuang19 Jun 3, 2022
6bb5255
Added additional output variables to idf and csv_to_mos.py
karthikeyad-pnnl Jun 10, 2022
ba36a93
Added additional output variables to FanCoil.dat
karthikeyad-pnnl Jun 10, 2022
3c86a04
Merge branch 'upstream_master' into issue2886_fanCoilModel
karthikeyad-pnnl Jun 13, 2022
4402c76
Added new idf files and updated bash and python scripts to run them a…
karthikeyad-pnnl Jun 14, 2022
71397ea
Added dat file for new idf. Modified python script
karthikeyad-pnnl Jun 14, 2022
52078de
Updated control module name
karthikeyad-pnnl Jun 15, 2022
e97bfb4
Added new class to Data package to introduce new calculations for coo…
karthikeyad-pnnl Jun 15, 2022
3ed0159
Added validation file that uses SPAWN thermal zone
karthikeyad-pnnl Jun 15, 2022
cc890b5
Replaced fan type with model that uses mass flowrate input
karthikeyad-pnnl Jun 15, 2022
6974747
Added calculations for cumulative energy consumption. Replaced sizing…
karthikeyad-pnnl Jun 15, 2022
4691780
Changed simulation time to cooling season
karthikeyad-pnnl Jun 15, 2022
adf0a1a
Added new plotting script to study cooling mode operation
karthikeyad-pnnl Jun 15, 2022
e6943df
Added output variable for sensible cooling rate to data file
karthikeyad-pnnl Jun 23, 2022
0eb4cac
Added new output variable to .dat file
karthikeyad-pnnl Jun 23, 2022
89a6d61
Updated files
karthikeyad-pnnl Jun 24, 2022
8de271b
Added output variable for humidity ratio to python script
karthikeyad-pnnl Jun 25, 2022
a15b56e
Added new output variable to dat file
karthikeyad-pnnl Jun 25, 2022
064f32b
Added new class for cooling coil UA calculations. Changed current mod…
karthikeyad-pnnl Jun 27, 2022
5ef407f
Upadted models to use HHW and CHW sources with mass flowrate input
karthikeyad-pnnl Jun 29, 2022
a375198
Added file for fan curve calculations
karthikeyad-pnnl Jun 29, 2022
489afaa
Added fan curves to fan model. Added fan power plots to .mos scripts
karthikeyad-pnnl Jun 29, 2022
6f2dfa2
Added additional correction factor to UA calculations
karthikeyad-pnnl Jul 1, 2022
7584c2f
Updated package structure and model class names
karthikeyad-pnnl Jul 5, 2022
a03b61f
Merge remote-tracking branch 'Sen_upstream/issue2886_fanCoilModel' in…
karthikeyad-pnnl Jul 5, 2022
a647524
Removed unused sizing calculations
karthikeyad-pnnl Jul 5, 2022
8d79675
Removed unused data resources
karthikeyad-pnnl Jul 5, 2022
7473e8c
Upadetd package order file
karthikeyad-pnnl Jul 5, 2022
78b3cb7
Merge pull request #2 from karthikeyad-pnnl/issue2886_fanCoilModel
SenHuang19 Jul 5, 2022
92a1b16
fix path issues in the example
Jul 5, 2022
15b9a9a
Moved FCU fan performance curve to zone equipment package
karthikeyad-pnnl Jul 5, 2022
d557b25
fixed the warning and errors in the validation example
Jul 7, 2022
0cd2c0c
Updated propagation parameter for fan performance curve
karthikeyad-pnnl Jul 7, 2022
82def11
Merge remote-tracking branch 'Sen_upstream/issue2886_fanCoilModel' in…
karthikeyad-pnnl Jul 7, 2022
d9ab967
Updated parameters for heating mode validation
karthikeyad-pnnl Jul 15, 2022
7a7a21c
Updated fan curve to get energy results closer to EPlus
karthikeyad-pnnl Jul 15, 2022
2679c2a
Added output variables for system node pressure at fan inlet and outlet
karthikeyad-pnnl Jul 16, 2022
af7b3bd
Updated dat file
karthikeyad-pnnl Jul 16, 2022
6cb3501
Added data for fan pressure rise to data table
karthikeyad-pnnl Jul 19, 2022
583b684
Updated package structure and removed redundant files and models
karthikeyad-pnnl Jul 20, 2022
58139e9
Updated package structure. Added control module for constant fan spee…
karthikeyad-pnnl Jul 20, 2022
ebf748a
Added control module for multispeed fan control
karthikeyad-pnnl Jul 21, 2022
17572da
Updated package order files
karthikeyad-pnnl Jul 21, 2022
2cc9c98
Added open loop validation models for both heating and cooling mode o…
karthikeyad-pnnl Jul 21, 2022
fa7b07c
Updated package order
karthikeyad-pnnl Jul 21, 2022
87ca7b6
Updated sizing file with correct value of outlet air temperature
karthikeyad-pnnl Jul 22, 2022
063c90e
Changed model names for control modules
karthikeyad-pnnl Jul 26, 2022
0e2c5cd
Updated correction factor for cooling coil UA
karthikeyad-pnnl Jul 26, 2022
500ddfb
Updated formatting and documentation
karthikeyad-pnnl Aug 4, 2022
4a82f17
Removed redundant parameter setting
karthikeyad-pnnl Aug 4, 2022
82742a1
Updated documentation
karthikeyad-pnnl Aug 8, 2022
d270dd6
Updated cooling mode validation model
karthikeyad-pnnl Aug 9, 2022
2447937
Updated documentation for cooling mode validation model
karthikeyad-pnnl Aug 9, 2022
2eb534e
Updated documentation sections
karthikeyad-pnnl Aug 9, 2022
92b2ecf
Removed redundant instances and plots
karthikeyad-pnnl Aug 9, 2022
32edf6c
Updated documentation and models
karthikeyad-pnnl Aug 11, 2022
c5fe2f9
Updated validation script
karthikeyad-pnnl Aug 11, 2022
8d6a19f
Added svg files
karthikeyad-pnnl Aug 11, 2022
e4d581b
Upadted control modules
karthikeyad-pnnl Aug 12, 2022
565f668
Updated models for multispeed fan controller
karthikeyad-pnnl Aug 13, 2022
a50a2ee
Added documentation to control modules
karthikeyad-pnnl Aug 16, 2022
8561746
Updated validation models and associated documentation
karthikeyad-pnnl Aug 19, 2022
922668b
Updated connection statement
karthikeyad-pnnl Aug 19, 2022
5cab0ab
Updated comments
karthikeyad-pnnl Sep 2, 2022
5812d60
Updated data types for parameters
karthikeyad-pnnl Sep 2, 2022
7009ea2
Updated validation model names
karthikeyad-pnnl Sep 2, 2022
a6fdeac
Renamed control modules
karthikeyad-pnnl Sep 2, 2022
a1bcc38
Updated files based on comments
karthikeyad-pnnl Sep 6, 2022
38efb5c
Updated documentation and formatting
karthikeyad-pnnl Sep 6, 2022
45611e2
Updated validation script and removed unused expression blocks
karthikeyad-pnnl Sep 6, 2022
b95f262
Renamed system model and updated documentation for validation files
karthikeyad-pnnl Sep 6, 2022
41e39bf
Updated class names for validation records
karthikeyad-pnnl Sep 8, 2022
b7319a7
Updated type class
karthikeyad-pnnl Sep 8, 2022
0e817f1
Removed folder that is not part of upstream repo
karthikeyad-pnnl Sep 8, 2022
f773839
Updated validation script
karthikeyad-pnnl Sep 8, 2022
d781f2c
Updated instance names for uniformity
karthikeyad-pnnl Sep 9, 2022
f4321da
Changed calculated parameter to protected
karthikeyad-pnnl Sep 9, 2022
b1c79de
Updated connections and removed unnecessary value
karthikeyad-pnnl Sep 9, 2022
27bd00c
Updated instance name
karthikeyad-pnnl Sep 9, 2022
512b4f0
Merge pull request #3 from karthikeyad-pnnl/issue2886_fanCoilModel
SenHuang19 Sep 9, 2022
ea42113
clean up
Sep 11, 2022
fbc46ce
Merge pull request #35 from SenHuang19/issue2886_fanCoilModel
karthikeyad-pnnl Sep 13, 2022
6517b72
Upadted icon layer for FCU model. Upadted graphical layer for validat…
karthikeyad-pnnl Sep 13, 2022
a8ffab9
Updated medium name for chilled water to MediumCW. Fixed simulation i…
karthikeyad-pnnl Sep 13, 2022
cf3dd8e
Updated documentation. Changed instance names and medium for CHW comp…
karthikeyad-pnnl Sep 14, 2022
81894c4
Updated control logic for variable fan-constant flow controller
karthikeyad-pnnl Sep 19, 2022
ccbbeda
Added output interfaces for measured fan speed and supply temperature
karthikeyad-pnnl Sep 19, 2022
2cd8a6a
Added example package with model demonstrating use-case
karthikeyad-pnnl Sep 19, 2022
5547a3f
Updated documentation and formatting
karthikeyad-pnnl Sep 19, 2022
1f7e3ff
Updated documentation
karthikeyad-pnnl Sep 19, 2022
577b499
Added tolerance value to validation models
karthikeyad-pnnl Sep 19, 2022
53d817d
Fixed validation script
karthikeyad-pnnl Sep 19, 2022
9d0b579
Changed models to fix errors found in unit test
karthikeyad-pnnl Sep 19, 2022
047a398
Fixed parameter definition in sizing data file
karthikeyad-pnnl Sep 19, 2022
b755dba
Fixed parameter setting
karthikeyad-pnnl Sep 19, 2022
c350894
Fixed parameter data type in example package
karthikeyad-pnnl Sep 19, 2022
4d8787c
Added start vlue to outdoor air source medium
karthikeyad-pnnl Sep 19, 2022
5dca36f
Parametrized controls modifications
karthikeyad-pnnl Sep 20, 2022
8f93093
Added unit test results to the repo
karthikeyad-pnnl Sep 20, 2022
6015c41
Merge branch 'issue2886_fanCoilModel' of github.com:karthikeyad-pnnl/…
karthikeyad-pnnl Sep 20, 2022
ad5a479
Removed illegal Modelica modifier
karthikeyad-pnnl Sep 20, 2022
575e74a
Merge pull request #4 from karthikeyad-pnnl/issue2886_fanCoilModel
SenHuang19 Sep 26, 2022
7b8c0ca
Updated all control modules to use an input signal for occupancy
karthikeyad-pnnl Sep 27, 2022
702dc21
Changed package structure to include baseclasses
karthikeyad-pnnl Sep 27, 2022
6cf5a35
minor clean up and a bug fix
Sep 28, 2022
6f45446
Merge branch 'issue2886_fanCoilModel' of github.com:SenHuang19/modeli…
karthikeyad-pnnl Sep 29, 2022
02886e1
Merge branch 'SenHuang19-issue2886_fanCoilModel' into issue2886_fanCo…
karthikeyad-pnnl Sep 29, 2022
09d3b97
fix html issue
Sep 29, 2022
98ada73
Updated formatting
karthikeyad-pnnl Sep 29, 2022
9e7779f
minor changes to the model and update the reference dataset
Sep 29, 2022
2db15c8
Updated formatting and added documentation
karthikeyad-pnnl Sep 29, 2022
fbde96a
clean up
Sep 29, 2022
21872dc
Added baseclasses for zone HVAC, controller and example
karthikeyad-pnnl Oct 3, 2022
7d346d0
Merge branch 'issue2886_fanCoilModel' of github.com:SenHuang19/modeli…
karthikeyad-pnnl Oct 3, 2022
bef21a0
Merge branch 'SenHuang19-issue2886_fanCoilModel' into issue2886_fanCo…
karthikeyad-pnnl Oct 3, 2022
dfbc265
Added unit test results
karthikeyad-pnnl Oct 3, 2022
0a5b001
Updated formatting
karthikeyad-pnnl Oct 3, 2022
86e4c70
Updated interface baseclasses
karthikeyad-pnnl Nov 10, 2022
91a7c18
Merge remote-tracking branch 'karthikeyad-pnnl/modelica-buildings/SPA…
terrancelu92 Nov 11, 2022
56e55a7
First structure of validation example files
terrancelu92 Nov 14, 2022
e119611
Added script for old style validation model
karthikeyad-pnnl Nov 22, 2022
560c806
Fixed compilation errors in baseclasses
karthikeyad-pnnl Nov 22, 2022
71c6a15
Updated baseclasses and package structure
karthikeyad-pnnl Dec 6, 2022
73f3dcc
First implementation of EPlus validation data
terrancelu92 Dec 6, 2022
ecbe990
Merge remote-tracking branch 'karthikeyad-pnnl/modelica-buildings/SPA…
terrancelu92 Dec 6, 2022
135a6f9
Merge remote-tracking branch 'lbl-srg/modelica-buildings/master' into…
terrancelu92 Dec 6, 2022
d083abe
Moved types package to baseclasses
karthikeyad-pnnl Dec 9, 2022
40208fb
Updated files
karthikeyad-pnnl Dec 12, 2022
1a1c1bf
Merge branch 'SPAWN_ZoneHVACSystems_092722' into issue2886_fanCoilMod…
karthikeyad-pnnl Dec 12, 2022
a055057
Merge remote-tracking branch 'karthikeyad-pnnl/modelica-buildings/SPA…
terrancelu92 Dec 12, 2022
93d15d9
First implementation of window AC model and open loop verification
terrancelu92 Dec 19, 2022
4dc406a
Add simulate and plot scripts
terrancelu92 Dec 20, 2022
a75b0ba
Updated files
karthikeyad-pnnl Dec 20, 2022
03650b0
Removed DAT file
karthikeyad-pnnl Dec 20, 2022
6091997
Merge branch 'SPAWN_ZoneHVACSystems_092722' into Xing_development_branch
karthikeyad-pnnl Dec 21, 2022
d2d7867
Updated window AC validation models with control loop to operation in…
karthikeyad-pnnl Dec 22, 2022
684bfa5
Removed .dat file
karthikeyad-pnnl Dec 22, 2022
f8caa10
Merge pull request #1 from karthikeyad-pnnl/Xing_development_branch
terrancelu92 Dec 22, 2022
500e130
Add cycle fan cycle coil control and examples
terrancelu92 Jan 13, 2023
7d96c77
Delete the dedicated OA port example case
terrancelu92 Jan 14, 2023
e267e85
Change the waiting time for cooling coil and fan and update the simul…
terrancelu92 Jan 17, 2023
25438d1
First implementation of DX heating coil
terrancelu92 Feb 21, 2023
0523372
Remove unnecessary models
terrancelu92 Feb 23, 2023
c817237
Change back the modifications for the original buildings library file…
terrancelu92 Feb 23, 2023
7f9bfd7
Merge branch 'dxcoil_heating_example' into spawn_development
terrancelu92 Mar 6, 2023
42f670b
Renamed AirCooled to AirSource, and same for WaterCooled
mwetter Mar 10, 2023
6d85b27
Restructure the DX coil package to implement the DX heating coil
terrancelu92 Mar 15, 2023
39f888b
Modify the other models that are impacted by the structure change
terrancelu92 Mar 16, 2023
bd656f7
Update SpaceCooling.mo
terrancelu92 Mar 16, 2023
d9da78c
Update SingleSpeedDXHeating.mo
terrancelu92 Mar 16, 2023
d0b5708
Change the curve record to disable some DX coil parameters for heatin…
terrancelu92 Mar 16, 2023
3644933
Renamed files for validation activity
karthikeyad-pnnl Mar 17, 2023
d426c24
Renamed variables as per changes
karthikeyad-pnnl Mar 17, 2023
16a05fe
Updated variable names in validation script to reflect changes in ins…
karthikeyad-pnnl Mar 17, 2023
a397aef
Added simulate and plot script for example file for DX heating coil
karthikeyad-pnnl Mar 17, 2023
ec105cb
Undo changes to validation script to facilitate easier comparison dur…
karthikeyad-pnnl Mar 17, 2023
3188232
Renamed dxCoi instances to dxCoo
karthikeyad-pnnl Mar 17, 2023
7efaad7
Changed coil instance name as per updated class names
karthikeyad-pnnl Mar 17, 2023
ad85d96
Updated unit test result
karthikeyad-pnnl Mar 17, 2023
ae10545
Added new unit test result files for DX heating coil
karthikeyad-pnnl Mar 17, 2023
3c65ef1
Renamed single speed example file
karthikeyad-pnnl Mar 18, 2023
73f4d22
Updated file name for multistage DX cooling coil example
karthikeyad-pnnl Mar 18, 2023
1fe79d8
Renamed example file for multistage DX cooling coil
karthikeyad-pnnl Mar 18, 2023
8805313
Updated instance name for coil calculations from dxCoo to dxCoi
karthikeyad-pnnl Mar 18, 2023
ecf7c2d
Updated instance names for coil calculations blocks in validation/exa…
karthikeyad-pnnl Mar 18, 2023
7a6b3bb
Updated unit test results after updates to instance and class names
karthikeyad-pnnl Mar 18, 2023
bd69c83
Updated documentation
karthikeyad-pnnl Mar 20, 2023
a5b8c1f
Merge pull request #5 from karthikeyad-pnnl/Xing_heating_coil_develop…
terrancelu92 Mar 20, 2023
6483bbd
Added validation case (PLR=1) for the DX heating coil
terrancelu92 Mar 23, 2023
b9d79d6
Added the validation case for PLR<1
terrancelu92 Mar 23, 2023
e0b7a3a
Added the mos script for the validation cases
terrancelu92 Mar 23, 2023
589b935
Update SingleSpeedHeatingEnergyPlus.mos
terrancelu92 Mar 23, 2023
eeaaa55
Merge branch 'issue3288_dxCoilHeating_renameCooledSource' into spawn_…
terrancelu92 Mar 28, 2023
004abbd
Updated class names to show use in both cooling and heating mode oper…
karthikeyad-pnnl Mar 28, 2023
0b890d7
Updated validation model by removing hard-coded data tables
karthikeyad-pnnl Mar 28, 2023
212cf27
Added validation models for all 4 defrost mode combinations
karthikeyad-pnnl Mar 28, 2023
73d5ea9
First implementation of PTHP model and example
terrancelu92 Mar 31, 2023
77dc6c5
Updated validation models and defrost calculations
karthikeyad-pnnl Mar 31, 2023
74f1da6
Renamed class for multi-stage DX cooling coil
karthikeyad-pnnl Mar 31, 2023
a4b5628
Updated class name for single speed DX cooling coil
karthikeyad-pnnl Mar 31, 2023
66735f7
Updated class name for variable speed DX cooling coil.
karthikeyad-pnnl Mar 31, 2023
a4d8e55
Changed class name for single speed DX heating coil
karthikeyad-pnnl Mar 31, 2023
50834c2
Changed validation model class name for single speed DX cooling coil
karthikeyad-pnnl Mar 31, 2023
9ef501c
Updated class name for validation model for single speed DX cooling c…
karthikeyad-pnnl Mar 31, 2023
ab8b918
Fixed changes to class name
karthikeyad-pnnl Mar 31, 2023
d6e446e
Fixed issues with renaming
karthikeyad-pnnl Mar 31, 2023
30b0648
Updated validation model class names for DX heating coils
karthikeyad-pnnl Mar 31, 2023
ffe0cc9
Removed two unused validation models
karthikeyad-pnnl Mar 31, 2023
086c766
Updated data records
karthikeyad-pnnl Apr 2, 2023
96cd79f
Updated example model for single speed DX heating coil
karthikeyad-pnnl Apr 2, 2023
0befdb4
Updated validation models for DX heating coil
karthikeyad-pnnl Apr 2, 2023
5a5f146
Updated blocks for defrost calculations
karthikeyad-pnnl Apr 2, 2023
f9209fd
Updated instance names for coil capacity calculations
karthikeyad-pnnl Apr 2, 2023
848bd10
Updated instance names for coil capacity calculations
karthikeyad-pnnl Apr 2, 2023
fff93e0
Updated baseclasses for DX coil model
karthikeyad-pnnl Apr 2, 2023
2e30dcf
Updated instance name related to coil capacity calculations
karthikeyad-pnnl Apr 2, 2023
527719d
Updated formatting and documentation on validation model
karthikeyad-pnnl Apr 3, 2023
00b3dc3
Updated formatting and validation for DX heating coil validation mode…
karthikeyad-pnnl Apr 3, 2023
8e6e024
Updated formatting and documentation
karthikeyad-pnnl Apr 3, 2023
9b668a7
Updated documentation for types enumeration. Moved them to separate t…
karthikeyad-pnnl Apr 3, 2023
568530f
Updated class name from CoolingCapacityAirCooled to CoilCapacityAirSo…
karthikeyad-pnnl Apr 3, 2023
fb7e7fa
Added documentation and validation script for PLRToPulse class. Updat…
karthikeyad-pnnl Apr 3, 2023
2a87a96
Updated change log to indicate class name change
karthikeyad-pnnl Apr 3, 2023
1c4738f
Updated instance names from cooCap to coiCap
karthikeyad-pnnl Apr 3, 2023
a474eb3
Renamed AirCooled to AirSource, and same for WaterCooled
mwetter Mar 10, 2023
e4e7ccf
Merge branch 'issue3288_dxCoilHeating_renameCooledSource' of github.c…
karthikeyad-pnnl Apr 3, 2023
3b5af4d
Removed unused Dymola script files
karthikeyad-pnnl Apr 4, 2023
40d6b7c
Updated folder structure to match package structure
karthikeyad-pnnl Apr 4, 2023
cb96e3d
Removed unnecessary warning from validation models. Split up single m…
karthikeyad-pnnl Apr 4, 2023
c10ce7e
Added tolerance to validation model
karthikeyad-pnnl Apr 4, 2023
815af0d
Updated path to defrost definition type enumerations in the defrost d…
karthikeyad-pnnl Apr 4, 2023
20da77f
Updated type enumeration definition paths in enable section for defro…
karthikeyad-pnnl Apr 4, 2023
3b156ac
Resolved error related to overridden final modifiers
karthikeyad-pnnl Apr 4, 2023
8c76d37
Corrected typo in file path
karthikeyad-pnnl Apr 4, 2023
3bb6f47
Updated instance names for coil capacity calculations
karthikeyad-pnnl Apr 4, 2023
2f88fdb
Removed final from modifiers
karthikeyad-pnnl Apr 4, 2023
298ba14
Updated unit test results
karthikeyad-pnnl Apr 4, 2023
3a8442f
Merge pull request #62 from karthikeyad-pnnl/Xing_heating_coil_develo…
karthikeyad-pnnl Apr 4, 2023
59973ab
Resolved errors found through checklist
karthikeyad-pnnl Apr 4, 2023
88087bf
Resolved errors found during HTML and simulation setup checks
karthikeyad-pnnl Apr 4, 2023
e507b79
Updated package order
karthikeyad-pnnl Apr 4, 2023
6e05d4d
Merge pull request #63 from karthikeyad-pnnl/Xing_heating_coil_develo…
karthikeyad-pnnl Apr 4, 2023
638c577
Updated curve names for cooling coil data in examples package
karthikeyad-pnnl Apr 4, 2023
81b0f68
Updated formatting and documentation
karthikeyad-pnnl Apr 5, 2023
ca29f47
Updated documentation for data center application example for air-sou…
karthikeyad-pnnl Apr 5, 2023
d8d068c
Updated formatting
karthikeyad-pnnl Apr 5, 2023
2aa3fb0
Updated change log for baseclass files
karthikeyad-pnnl Apr 5, 2023
67f2a4b
Updated documentation for remaining classes for User Guide and water …
karthikeyad-pnnl Apr 5, 2023
84630db
Add heating mode and cooling mode validation case for PTHP
terrancelu92 Apr 6, 2023
33cb3ba
Updated scripts for generating dat file
karthikeyad-pnnl Apr 6, 2023
dfc3122
Replaced dat files with smaller sized files
karthikeyad-pnnl Apr 6, 2023
ebd96d2
Merge pull request #64 from karthikeyad-pnnl/Xing_heating_coil_develo…
karthikeyad-pnnl Apr 6, 2023
2a17efc
Updated files to resolve errors in unit test
karthikeyad-pnnl Apr 6, 2023
4a3b502
Merge branch 'Xing_heating_coil_development' into issue3288_dxCoilHea…
karthikeyad-pnnl Apr 6, 2023
9fc076c
Updated unit test results
karthikeyad-pnnl Apr 7, 2023
c49aa92
Add documentation for PTHPs
terrancelu92 Apr 7, 2023
1959927
Enhance PTHP documentation
terrancelu92 Apr 7, 2023
f2db768
Merge branch 'spawn_development' of github.com:terrancelu92/modelica-…
karthikeyad-pnnl Apr 10, 2023
f7d5021
Merge branch 'terrancelu92-spawn_development' into Xing_PTHP_development
karthikeyad-pnnl Apr 10, 2023
11e63c0
Merge branch 'issue3288_dxCoilHeating_renameCooledSource' into Xing_P…
karthikeyad-pnnl Apr 10, 2023
3bc6938
Created copy with suffix 1
karthikeyad-pnnl Apr 11, 2023
05192dd
Removed unnecessary files
karthikeyad-pnnl Apr 11, 2023
1367e9a
Updated documentation and validation scripts. Removed unused files in PR
karthikeyad-pnnl Apr 11, 2023
c5e034b
Fixed multiline command in validation script
karthikeyad-pnnl Apr 11, 2023
ae38469
Added tolerance to example file
karthikeyad-pnnl Apr 11, 2023
a1b7b0f
Updated baseclass extension to resolve pedantic mode error
karthikeyad-pnnl Apr 11, 2023
c3621ed
Removed start value for thermal zone air temperature
karthikeyad-pnnl Apr 11, 2023
c04b01e
Unit test for PTHP package
terrancelu92 Apr 11, 2023
52a7ca4
Merge pull request #68 from terrancelu92/issue3327_SPAWN_PTHPdevelopment
karthikeyad-pnnl Apr 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ Buildings/Resources/src/ThermalZones/EnergyPlus*/FMUs/Zones1.fmu filter=lfs diff
Buildings/Resources/src/ThermalZones/EnergyPlus*/FMUs/Zones3.fmu filter=lfs diff=lfs merge=lfs -text
Buildings/Resources/bin/spawn-*/linux64/bin/spawn* filter=lfs diff=lfs merge=lfs -text
Buildings/Resources/bin/spawn-*/win64/bin/spawn* filter=lfs diff=lfs merge=lfs -text
Buildings/Resources/Data/Fluid/ZoneEquipment/FanCoil.dat filter=lfs diff=lfs merge=lfs -text
Buildings/Resources/Data/Fluid/ZoneEquipment/FanCoilAutoSize_ConstantFlowVariableFan.dat filter=lfs diff=lfs merge=lfs -text
Buildings/Resources/Data/Fluid/ZoneEquipment/fan_curve_calculations.xlsx filter=lfs diff=lfs merge=lfs -text
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,5 @@ Buildings/Resources/src/fluid/heatpumps/calibration/doc/build/doctrees
eplus*
sqlite*
Buildings/spawn-*
Buildings/Fluid/ZoneEquipment/BaseClasses/Types.mo
Buildings/Fluid/ZoneEquipment/UnitHeater/Validation/CoolingMode.mo
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ within Buildings.Applications.DataCenters.DXCooled.Examples;
model DXCooledAirsideEconomizer
"Example that illustrates the use of Buildings.Fluid.HeatExchanger.DXCoil in a data center room"
extends Modelica.Icons.Example;
extends Buildings.Applications.DataCenters.ChillerCooled.Examples.BaseClasses.PostProcess(
extends
Buildings.Applications.DataCenters.ChillerCooled.Examples.BaseClasses.PostProcess(
fulMecCooSig(
y=if cooModCon.y == Integer(Buildings.Applications.DataCenters.Types.CoolingModes.FullMechanical)
then 1 else 0),
Expand Down Expand Up @@ -47,7 +48,7 @@ model DXCooledAirsideEconomizer
m_flow_nominal=mA_flow_nominal,
nPorts=2) "Simplified data center room"
annotation (Placement(transformation(extent={{40,-120},{60,-100}})));
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.VariableSpeed varSpeDX(
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.VariableSpeedCooling varSpeDX(
redeclare package Medium = Medium,
dp_nominal=400,
datCoi=datCoi,
Expand Down Expand Up @@ -90,53 +91,53 @@ model DXCooledAirsideEconomizer
Modelica.Blocks.Sources.Constant SATSetPoi(k=TAirSupSet)
"Supply air temperature set point"
annotation (Placement(transformation(extent={{-240,90},{-220,110}})));
parameter Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.DXCoil datCoi(
parameter Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.CoolingCoil datCoi(
nSta=4,
sta={
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.Stage(
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.Stage(
spe=900/60,
nomVal=
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.NominalValues(
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.NominalValues(
Q_flow_nominal=QCoiC_flow_nominal*(3/8),
COP_nominal=3,
SHR_nominal=0.8,
TEvaIn_nominal=TRooSet,
m_flow_nominal=mA_flow_nominal),
perCur=
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Examples.PerformanceCurves.Curve_I()),
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.Stage(
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Examples.PerformanceCurves.DXCooling_Curve_I()),
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.Stage(
spe=1200/60,
nomVal=
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.NominalValues(
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.NominalValues(
Q_flow_nominal=QCoiC_flow_nominal*(1/2),
COP_nominal=3,
SHR_nominal=0.8,
TEvaIn_nominal=TRooSet,
m_flow_nominal=mA_flow_nominal),
perCur=
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Examples.PerformanceCurves.Curve_I()),
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.Stage(
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Examples.PerformanceCurves.DXCooling_Curve_I()),
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.Stage(
spe=1800/60,
nomVal=
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.NominalValues(
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.NominalValues(
Q_flow_nominal=QCoiC_flow_nominal*(3/4),
COP_nominal=3,
SHR_nominal=0.8,
TEvaIn_nominal=TRooSet,
m_flow_nominal=mA_flow_nominal),
perCur=
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Examples.PerformanceCurves.Curve_II()),
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.Stage(
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Examples.PerformanceCurves.DXCooling_Curve_II()),
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.Stage(
spe=2400/60,
nomVal=
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Data.Generic.BaseClasses.NominalValues(
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Data.Generic.BaseClasses.NominalValues(
Q_flow_nominal=QCoiC_flow_nominal,
COP_nominal=3,
SHR_nominal=0.8,
TEvaIn_nominal=TRooSet,
m_flow_nominal=mA_flow_nominal),
perCur=
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.Examples.PerformanceCurves.Curve_III())})
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.Examples.PerformanceCurves.DXCooling_Curve_III())})
"Coil data"
annotation (Placement(transformation(extent={{100,80},{120,100}})));
Buildings.Fluid.Actuators.Dampers.MixingBox eco(
Expand Down Expand Up @@ -293,14 +294,6 @@ equation
connect(roo.TRooAir, cooModCon.TRet)
annotation (Line(points={{61,-110},{90,-110},{90,-88},{-180,-88},{-180,65},
{-172,65}}, color={0,0,127}));
connect(weaBus.TDryBul, varSpeDX.TConIn)
annotation (Line(
points={{-240,70},{-240,-40},{-60,-40},{-60,-57},{-21,-57}},
color={255,204,51},
thickness=0.5), Text(
textString="%first",
index=-1,
extent={{-6,3},{-6,3}}));
connect(cooModCon.y, sigCha.u)
annotation (Line(
points={{-149,70},{-142,70},{-142,160},{178,160}},
Expand Down Expand Up @@ -329,15 +322,23 @@ equation
annotation (Line(
points={{-39,-10},{-28,-10},{-28,-52},{-21,-52}},
color={0,0,127}));
connect(weaBus.TDryBul, varSpeDX.TOut) annotation (Line(
points={{-240,70},{-240,-40},{-40,-40},{-40,-57},{-21,-57}},
color={255,204,51},
thickness=0.5), Text(
string="%first",
index=-1,
extent={{-6,3},{-6,3}},
horizontalAlignment=TextAlignment.Right));
annotation (Diagram(coordinateSystem(preserveAspectRatio=false,
extent={{-280,-200},{320,220}})),
__Dymola_Commands(file=
"modelica://Buildings/Resources/Scripts/Dymola/Applications/DataCenters/DXCooled/Examples/DXCooledAirsideEconomizer.mos"
"Simulate and plot"),
Documentation(info="<html>
<p>
This example illustrates how to use <a href=\"modelica://Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.VariableSpeed\">
Buildings.Fluid.HeatExchangers.DXCoils.AirCooled.VariableSpeed</a> in a cooling system for data center rooms.
This example illustrates how to use <a href=\"modelica://Buildings.Fluid.HeatExchangers.DXCoils.AirSource.VariableSpeed\">
Buildings.Fluid.HeatExchangers.DXCoils.AirSource.VariableSpeed</a> in a cooling system for data center rooms.
</p>
<h4>System description</h4>
<p>
Expand Down Expand Up @@ -375,6 +376,12 @@ The room temperature is maintained at 24&deg;C by adjusting the speed of the sup
</html>", revisions="<html>
<ul>
<li>
April 4, 2023, by Karthik Devaprasad:<br/>
Updated classes used in the coil data record <code>datCoi</code> as per the changed
class names.<br/>
Updated class used for variable speed DX cooling coil <code>varSpeDX</code>.
</li>
<li>
August 16, 2017 by Yangyang Fu:<br/>
First implementation.
</li>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Curve_I
Curve_II
Curve_III
DXHeating_Curve_I
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
MultiStage
SingleSpeed
SingleSpeedHeatingDX
SpaceCooling
VariableSpeed
PerformanceCurves

This file was deleted.

Loading