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

Issue622 wet coil refactor 3 #2001

Closed
wants to merge 59 commits into from
Closed

Issue622 wet coil refactor 3 #2001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
b8de563
Wet coil model important refactoring
kim1077 Apr 13, 2020
5e92e4f
Add sigmoid function
kim1077 Apr 28, 2020
1810956
Fuzzy Condensing Cooling Coil Model Development, Internal iterations …
kim1077 May 8, 2020
7ecdb42
Fuzzy model edited
kim1077 May 14, 2020
06d3132
Travis editted
kim1077 May 14, 2020
5aa1338
Merge branch 'master' of https://github.com/lbl-srg/modelica-building…
AntoineGautier May 14, 2020
429556c
Checkout package.order from master
AntoineGautier May 28, 2020
14f7839
Fix typo
AntoineGautier May 28, 2020
d0e2a21
Format
AntoineGautier May 28, 2020
da2cb69
Update validation cases and scripts
AntoineGautier May 28, 2020
e07f48d
Merge branch 'master' of https://github.com/lbl-srg/modelica-building…
AntoineGautier May 28, 2020
dde2126
Update script with standard simulation parameters [ci skip]
AntoineGautier May 28, 2020
906f456
Update scripts
AntoineGautier May 29, 2020
b6a9acd
Update validation models and scripts
AntoineGautier May 29, 2020
7a37f27
Dummy commit [ci skip]
AntoineGautier May 29, 2020
c3cf263
Update scripts [ci skip]
AntoineGautier May 29, 2020
34cc92a
dummy
kim1077 Jun 2, 2020
e564ce8
-- unnecessary partially wet coil iteration is avoided.
kim1077 Jun 11, 2020
024be33
Rename example and validation models [ci skip]
AntoineGautier Jun 11, 2020
00c17d6
Merge branch 'master' of https://github.com/lbl-srg/modelica-building…
AntoineGautier Jun 11, 2020
5aa53e2
Merge branch 'master' of https://github.com/lbl-srg/modelica-building…
AntoineGautier Jun 15, 2020
83687ed
Trial to prevent small mass flow rate & updated e-NTU wetcoil model.
kim1077 Jul 8, 2020
28d589e
Added a validation file which compares the wet coil model with a refe…
kim1077 Jul 8, 2020
7684dc7
Treatment of IC
kim1077 Oct 23, 2020
7d93caf
Merge branch 'master' of https://github.com/lbl-srg/modelica-building…
AntoineGautier Nov 6, 2020
951f285
Merge branch with IBPSA model and refactored example and validation m…
AntoineGautier Nov 6, 2020
b961181
Add test models in Experimental.DHC.Loads
AntoineGautier Nov 10, 2020
455dc84
Update and add simulation scripts
AntoineGautier Nov 10, 2020
ffa1fe7
Merge branch 'master' of https://github.com/lbl-srg/modelica-building…
AntoineGautier Nov 10, 2020
a049e5b
Change stopTime in simulation script
AntoineGautier Nov 11, 2020
ad78fda
Add FVM to FCU validation
AntoineGautier Nov 11, 2020
a48e1d0
Update validation (FCU) with discretized model
AntoineGautier Nov 12, 2020
87d9863
Merge branch 'master' of https://github.com/lbl-srg/modelica-building…
AntoineGautier Nov 12, 2020
e07bc10
Fix bias at nominal conditions for FE model [ci skip]
AntoineGautier Nov 12, 2020
b5d75de
Update textbook validation
AntoineGautier Nov 20, 2020
1c25eb1
Add nominal dry and nominal wet conditions
AntoineGautier Nov 20, 2020
9cc0aa1
Merge branch 'master' of https://github.com/lbl-srg/modelica-building…
AntoineGautier Nov 20, 2020
12f1b0c
Comment out all
AntoineGautier Nov 20, 2020
9f766fa
Minor
AntoineGautier Nov 20, 2020
d407cd1
Add dry fraction comparison
AntoineGautier Nov 21, 2020
f2bb144
Merge branch 'master' of https://github.com/lbl-srg/modelica-building…
AntoineGautier Nov 24, 2020
847047b
Fuzzy model has been updated from V2.2.2 to V3 which is numerically m…
kim1077 Nov 24, 2020
7789127
Merge branch 'issue622_wet_coil_refactor_3_simplefuzzy' into issue622…
kim1077 Nov 24, 2020
7fad65f
Update with WetEffectivenessNTU_Fuzzy_V3
AntoineGautier Nov 24, 2020
80f51db
Key updates:
kim1077 Nov 27, 2020
ec79926
Initial code for extracting nominal UA from data.
kim1077 Nov 28, 2020
c159d93
equations for calculating UAnominal & wetfuzzy3 updates using smoothemax
kim1077 Dec 2, 2020
c4254a5
Merge branch 'master' of https://github.com/lbl-srg/modelica-building…
AntoineGautier Dec 10, 2020
3ed1a3b
Add VAV models
AntoineGautier Dec 10, 2020
1f86570
Update validation models
AntoineGautier Dec 11, 2020
8c357ba
Clean model
AntoineGautier Dec 11, 2020
9c042b7
Clean the code
AntoineGautier Dec 11, 2020
23e5223
docummentation of the fuzzy model
kim1077 Jan 15, 2021
cc4cba0
retreiving UA value via LMED
kim1077 Jan 15, 2021
59436a6
eliminate iteration via a virtual dynamics
kim1077 Jan 15, 2021
84e40ec
UA_nominal estimation error is below 0.2%, wAirOut is now a variable,…
kim1077 Jan 22, 2021
7f75746
development branch not for distribution
kim1077 Jan 26, 2021
5d234da
nomenclature updated
kim1077 Jan 26, 2021
456406e
documentation for the fuzzy cooling coil model
kim1077 Feb 1, 2021
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
265 changes: 130 additions & 135 deletions .travis.yml
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 26 additions & 18 deletions Buildings/.copiedFiles.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,30 @@ Buildings/BoundaryConditions/SolarIrradiation/package.order
Buildings/BoundaryConditions/Types.mo
Buildings/BoundaryConditions/UsersGuide.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckBlackBodySkyTemperature.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckDewPointTemperature.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckDryBulbTemperature.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckCeilingHeight.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckIRRadiation.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckPressure.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckRadiation.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckRelativeHumidity.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckSkyCover.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckTemperature.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckWindDirection.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/CheckWindSpeed.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertRadiation.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertRelativeHumidity.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/EquationOfTime.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckBlackBodySkyTemperature.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckCeilingHeight.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRadiation.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRelativeHumidity.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckSkyCover.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckTemperature.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindDirection.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindSpeed.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRadiation.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRelativeHumidity.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTime.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTimeNegativeStart.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTimePositiveStart.mo
Expand All @@ -129,24 +145,12 @@ Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/GetAbsolutePath.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/GetHeaderElement.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/GetTimeSpanTMY3_NonzeroStart.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/LimitMin.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/LocalCivilTime.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/SolarTime.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/package.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/Examples/package.order
Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterCeilingHeight.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterHorizontalInfraredIrradiation.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterOpaqueSkyCover.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterRelativeHumidity.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterTotalSkyCover.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterWindDirection.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/LimiterWindSpeed.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialLimiter.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/PartialLimiterMin.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/SolarTime.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/SourceSelector.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/SourceSelectorRadiation.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/getAbsolutePath.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/getHeaderElementTMY3.mo
Buildings/BoundaryConditions/WeatherData/BaseClasses/getLatitudeTMY3.mo
Expand Down Expand Up @@ -1439,8 +1443,16 @@ Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/
Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DiffusePerez.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/SolarIrradiation/Examples/DirectTiltedSurface.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckBlackBodySkyTemperature.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckCeilingHeight.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckPressure.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRadiation.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckRelativeHumidity.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckSkyCover.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckTemperature.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindDirection.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/CheckWindSpeed.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRadiation.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertRelativeHumidity.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTime.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTimeNegativeStart.mos
Buildings/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/BaseClasses/Examples/ConvertTimePositiveStart.mos
Expand Down Expand Up @@ -1809,11 +1821,9 @@ Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureD
Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/TemperatureDependentDensityTemperatureEnthalpyInversion.mos
Buildings/Resources/Scripts/Dymola/Media/Specialized/Water/Examples/WaterProperties_pT.mos
Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElements.mos
Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mos
Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomOneElement.mos
Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomThreeElements.mos
Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Examples/SimpleRoomTwoElements.mos
Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomSteadyState.mos
Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mos
Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mos
Buildings/Resources/Scripts/Dymola/ThermalZones/ReducedOrder/Validation/VDI6007/TestCase1.mos
Expand Down Expand Up @@ -1988,7 +1998,6 @@ Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/VDI6007WithWindow.m
Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/package.mo
Buildings/ThermalZones/ReducedOrder/EquivalentAirTemperature/package.order
Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElements.mo
Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo
Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomOneElement.mo
Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomThreeElements.mo
Buildings/ThermalZones/ReducedOrder/Examples/SimpleRoomTwoElements.mo
Expand All @@ -2012,7 +2021,6 @@ Buildings/ThermalZones/ReducedOrder/SolarGain/BaseClasses/package.order
Buildings/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo
Buildings/ThermalZones/ReducedOrder/SolarGain/package.mo
Buildings/ThermalZones/ReducedOrder/SolarGain/package.order
Buildings/ThermalZones/ReducedOrder/Validation/RoomSteadyState.mo
Buildings/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mo
Buildings/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mo
Buildings/ThermalZones/ReducedOrder/Validation/VDI6007/BaseClasses/VerifyDifferenceThreePeriods.mo
Expand Down
4 changes: 3 additions & 1 deletion Buildings/Examples/VAVReheat/ASHRAE2006.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ model ASHRAE2006
extends Modelica.Icons.Example;
extends Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop(
heaCoi(show_T=true),
cooCoi(show_T=true));
cooCoi(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
show_T=true));

parameter Real ratVMinCor_flow(final unit="1")=
max(1.5*VCorOA_flow_nominal, 0.15*mCor_flow_nominal/1.2) /
Expand Down
Loading