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

Add scripts, rename, remove old files #1128 #1302

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2ab5414
Add scripts, rename, remove old files #1128
Jul 14, 2022
c0eeeaa
Merge branch 'development' into issue1128_confusingHPNames
Jul 14, 2022
b3204f8
Rename every changes and add script
Jul 14, 2022
f2ea486
ci_correct_html
ebc-aixlib-bot Jul 14, 2022
e06186e
fix script
Jul 14, 2022
51e215c
Merge pull request #1301 from RWTH-EBC/Correct_HTML_issue1128_confusi…
FWuellhorst Jul 14, 2022
30a81c0
fix wrong conversions
Jul 14, 2022
20f7d8e
Merge branch 'issue1128_confusingHPNames' of https://github.com/RWTH-…
Jul 14, 2022
b2e006e
Fix names
Jul 14, 2022
b78722b
Merge branch 'development' into issue1128_confusingHPNames
Jul 21, 2022
7f6e44a
add show_gui
Jul 21, 2022
ab75a37
Merge branch 'development' into issue1128_confusingHPNames
Jul 22, 2022
940161a
debug ref
Jul 22, 2022
a8f463d
addecho
Jul 22, 2022
782fcf8
revert
Jul 22, 2022
a879860
install xdg utils
Jul 22, 2022
a98effa
fix install
Jul 22, 2022
520be2c
Merge remote-tracking branch 'remotes/origin/Issue1313_fix_Regression…
Jul 25, 2022
61d91c9
Automatic push of CI with new regression reference files.Please pull …
ebc-aixlib-bot Jul 25, 2022
4a305f3
chore: rm smooth switch
Jul 25, 2022
95a2b5c
Merge branch 'issue1128_confusingHPNames' of https://github.com/RWTH-…
Jul 25, 2022
2ff1ba9
Specify examples
Jul 27, 2022
6686bd2
Merge branch 'development' into issue1128_confusingHPNames
Aug 3, 2022
3a9d0b6
try EOL
Aug 4, 2022
85c67e5
Revert EOL
Aug 4, 2022
7f9441b
Merge branch 'issue1128_confusingHPNames' of https://github.com/RWTH-…
Aug 4, 2022
15c46e2
Revert
Aug 4, 2022
6da2b38
Merge branch 'development' into issue1128_confusingHPNames
FWuellhorst Oct 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion AixLib/Airflow/AirHandlingUnit/AHU.mo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Airflow.AirHandlingUnit;
within AixLib.Airflow.AirHandlingUnit;
model AHU
"Air Handling Unit with Heat Recovery System, Cooling, Heating, Humidification (adiabatic), Dehumidification"
extends AixLib.Airflow.AirHandlingUnit.BaseClasses.PartialAHU;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Airflow.FacadeVentilationUnit;
within AixLib.Airflow.FacadeVentilationUnit;
model FacadeVentilationUnit
"Facade Ventilation Unit (FVU) equipped with a recuperator"
replaceable package Water = AixLib.Media.Water
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.BoundaryConditions.GroundTemperature;
within AixLib.BoundaryConditions.GroundTemperature;
model GroundTemperatureKusuda "Model for undisturbed ground temperature"

parameter Modelica.Units.SI.Temperature T_mean
Expand Down
2 changes: 1 addition & 1 deletion AixLib/BoundaryConditions/InternalGains/CO2/CO2Balance.mo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.BoundaryConditions.InternalGains.CO2;
within AixLib.BoundaryConditions.InternalGains.CO2;
model CO2Balance "Calculation of CO2 concentration within a thermal zone"
parameter Modelica.Units.SI.Area areaZon "Zone area";
parameter Real actDeg = 1.8 "Activity degree (Met units)";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.BoundaryConditions.InternalGains.Humans.BaseClasses;
within AixLib.BoundaryConditions.InternalGains.Humans.BaseClasses;
model TemperatureDependentHeatOutputSIA2024
"Model for temperature dependent heat output based on formulas of SIA 2024"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.BoundaryConditions.InternalGains.Humans.BaseClasses;
within AixLib.BoundaryConditions.InternalGains.Humans.BaseClasses;
model TemperatureDependentMoistureOutputSIA2024
"Model for temperature dependent moisture output based on formulas of SIA 2024"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.BoundaryConditions.InternalGains.Moisture;
within AixLib.BoundaryConditions.InternalGains.Moisture;
model MoistureGains
"Model for moisture gains that are produced by plants, cooking, etc."

Expand Down
2 changes: 1 addition & 1 deletion AixLib/Controls/HVACAgentBasedControl/Agents/Broker.mo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Agents;
within AixLib.Controls.HVACAgentBasedControl.Agents;
model Broker
extends BaseClasses.PartialAgent;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Agents;
within AixLib.Controls.HVACAgentBasedControl.Agents;
model ColdProducerAgent
extends BaseClasses.PartialAgent;
parameter Real maxCapacity = 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Agents;
within AixLib.Controls.HVACAgentBasedControl.Agents;
model ConsumerAgent
extends BaseClasses.PartialAgent(
name=10001,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Agents;
within AixLib.Controls.HVACAgentBasedControl.Agents;
model HeatProducerAgent
extends BaseClasses.PartialAgent;
parameter Real maxCapacity = 100000 "maximum capacity for heatgeneration";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Agents;
within AixLib.Controls.HVACAgentBasedControl.Agents;
model IntermediateAgent
extends BaseClasses.PartialAgent;
parameter Integer broker = 10003 "Name of the corresponding broker-agent";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Agents;
within AixLib.Controls.HVACAgentBasedControl.Agents;
model MessageNotification

parameter Integer n=1
Expand Down
2 changes: 1 addition & 1 deletion AixLib/Controls/HVACAgentBasedControl/Agents/RoomAgent.mo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Agents;
within AixLib.Controls.HVACAgentBasedControl.Agents;
model RoomAgent
extends BaseClasses.PartialAgent(
name=10001,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.BaseClasses.Internal;
within AixLib.Controls.HVACAgentBasedControl.BaseClasses.Internal;
encapsulated function sendTo
import Modelica;
extends Modelica.Icons.Function;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.BaseClasses.Internal;
within AixLib.Controls.HVACAgentBasedControl.BaseClasses.Internal;
function sendToUDP
extends Modelica.Icons.Function;
input Modelica_DeviceDrivers.Communication.UDPSocket socket;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.BaseClasses;
within AixLib.Controls.HVACAgentBasedControl.BaseClasses;
partial model PartialAgent
parameter Integer name "Name of the agent (five-digit number, eg. 10001)";
parameter Boolean usePoke=false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.BaseClasses;
within AixLib.Controls.HVACAgentBasedControl.BaseClasses;
partial model PartialCostFunction

Modelica.Blocks.Interfaces.RealInput capacity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.BaseClasses;
within AixLib.Controls.HVACAgentBasedControl.BaseClasses;
model SendSample

Modelica.Blocks.MathBoolean.Or or1(nu=4)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.BaseClasses;
within AixLib.Controls.HVACAgentBasedControl.BaseClasses;
model UDPSend_adapted "A block for sending UDP datagrams"
import Modelica_DeviceDrivers;
extends Modelica_DeviceDrivers.Utilities.Icons.BaseIcon;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Economic;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Economic;
model Constant_Economic_Cost
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real p = 0.30 "Price per kWh of fuel";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Economic;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Economic;
model PV_Variable_Economic_Cost
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real p = 0.30 "Price per kWh of fuel";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
model Boiler_ExergyDestruction
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
model Boiler_ExergyDestruction_Simplified
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
model HeatPump_ExergyDestruction_Cooling
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
model HeatPump_ExergyDestruction_Heating
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
model HeatingRod_ExergyDestruction
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
model HeatingRod_ExergyDestruction_Simplified
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
model MixingValveAndHEX_ExergyDestruction
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.Exergy;
model MixingValveAndHEX_ExergyDestruction_Simplified
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.PrimaryExergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.PrimaryExergy;
model Boiler_PrimaryExergyDestruction_Simplified
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.PrimaryExergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.PrimaryExergy;
model HeatPump_PrimaryExergyDestruction_Cooling
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.PrimaryExergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.PrimaryExergy;
model HeatPump_PrimaryExergyDestruction_Heating
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.PrimaryExergy;
within AixLib.Controls.HVACAgentBasedControl.CostFunctions.PrimaryExergy;
model HeatingRod_PrimaryExergyDestruction_Simplified
extends HVACAgentBasedControl.BaseClasses.PartialCostFunction;
parameter Real T_0 = 298.15 "Exergy reference temperature";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading;
within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading;
model BookBuyerAgent
extends BaseClasses.PartialAgent;
parameter Real[:,1] knownSellers = [30001; 30002; 30003]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading;
within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading;
model BookSellerAgent
extends BaseClasses.PartialAgent;
Real[:,2] bookList( start= [3551551677.0,30; 3551551679.0,20; 3551551616.0, 20]);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading;
within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading;
model BookTrading
extends Modelica.Icons.Example;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading;
within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading;
model NetworkCommunication1
extends Modelica.Icons.Example;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading;
within AixLib.Controls.HVACAgentBasedControl.Examples.BookTrading;
model NetworkCommunication2
extends Modelica.Icons.Example;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Examples.BuildingHeatingSystems;
within AixLib.Controls.HVACAgentBasedControl.Examples.BuildingHeatingSystems;
model BuildingHeating
extends Modelica.Icons.Example;
parameter AixLib.DataBase.Weather.TRYWeatherBaseDataDefinition weatherDataDay = AixLib.DataBase.Weather.TRYWinterDay();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Examples.BuildingHeatingSystems;
within AixLib.Controls.HVACAgentBasedControl.Examples.BuildingHeatingSystems;
model BuildingHeating_usePoke
extends BuildingHeating(
roomAgent(usePoke=true),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Examples.BuildingHeatingSystems;
within AixLib.Controls.HVACAgentBasedControl.Examples.BuildingHeatingSystems;
model BuildingWithPV
extends Modelica.Icons.Example;
package Medium = AixLib.Media.Water;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.Examples.HVACAgentsCommunications;
within AixLib.Controls.HVACAgentBasedControl.Examples.HVACAgentsCommunications;
model SimpleCommunication
extends Modelica.Icons.Example;

Expand Down
2 changes: 1 addition & 1 deletion AixLib/Controls/HVACAgentBasedControl/UsersGuide/Award.mo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.UsersGuide;
within AixLib.Controls.HVACAgentBasedControl.UsersGuide;
class Award "Award"
extends Modelica.Icons.Information;
annotation (Documentation(info="<html><p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.UsersGuide;
within AixLib.Controls.HVACAgentBasedControl.UsersGuide;
class Gettingstarted "Getting started"
extends Modelica.Icons.Information;
annotation (Documentation(info="<html><h4>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.UsersGuide;
within AixLib.Controls.HVACAgentBasedControl.UsersGuide;
class Overview "Overview"
extends Modelica.Icons.Information;
annotation (Documentation(info="<html><p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HVACAgentBasedControl.UsersGuide;
within AixLib.Controls.HVACAgentBasedControl.UsersGuide;
class Requirements "Requirements"
extends Modelica.Icons.Information;
annotation (Documentation(info="<html><p>
Expand Down
2 changes: 1 addition & 1 deletion AixLib/Controls/HeatPump/AntiLegionella.mo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
within AixLib.Controls.HeatPump;
within AixLib.Controls.HeatPump;
model AntiLegionella "Control to avoid Legionella in the DHW"

parameter Modelica.Units.SI.ThermodynamicTemperature TLegMin=333.15
Expand Down
29 changes: 0 additions & 29 deletions AixLib/Controls/HeatPump/BaseClasses/OnOffHP.mo

This file was deleted.