Skip to content

Commit 5df0ad1

Browse files
Bump libraries
- https://github.com/ibpsa/modelica.git branch master updated to 3dd79c1f403eeb5ff908c060b6735e948b7a20ee. * [ibpsa/modelica-ibpsa@3dd79c1 3dd79c1] Merge pull request #1356 from ibpsa/issue1275_romTraceSubstances * [ibpsa/modelica-ibpsa@3048f92 3048f92] Merge pull request #1358 from ibpsa/issue1357_updateReferenceResults * [ibpsa/modelica-ibpsa@96c1251 96c1251] Merge branch 'issue1357_updateReferenceResults' into issue1275_romTraceSubstances * [ibpsa/modelica-ibpsa@c06397f c06397f] Rewrote package order * [ibpsa/modelica-ibpsa@e09dda5 e09dda5] Updated result for #1357 * [ibpsa/modelica-ibpsa@f041687 f041687] Added reference results * [ibpsa/modelica-ibpsa@3e9a13b 3e9a13b] Merge branch 'master' into issue1275_romTraceSubstances * [ibpsa/modelica-ibpsa@a334a37 a334a37] Revised example, changed outdoor CO2 concentration * [ibpsa/modelica-ibpsa@9c01093 9c01093] Merge pull request #1343 from katharinabr/issue1275_romTraceSubstances * [ibpsa/modelica-ibpsa@3014a82 3014a82] Update info section * [ibpsa/modelica-ibpsa@0e9cd89 0e9cd89] Rename trace substance concentration of ambient air * [ibpsa/modelica-ibpsa@412d1e4 412d1e4] Undo changes in SimpleRoomOneElement.mo * [ibpsa/modelica-ibpsa@363310f 363310f] Delete SimpleRoomOneElementTraceSubstance.mos * [ibpsa/modelica-ibpsa@db1a775 db1a775] Delete SimpleRoomOneElementTraceSubstance.mo * [ibpsa/modelica-ibpsa@7726455 7726455] Add ventilation for SimpleRoomFourElementsTraceSubstance.mo - https://github.com/lbl-srg/modelica-buildings.git branch master updated to 1174166a4c62690df6eb167eba6ed807aeddc8bd. * [lbl-srg/modelica-buildings@1174166 1174166] Merge pull request #1919 from lbl-srg/IBPSASync * [lbl-srg/modelica-buildings@ffe5150 ffe5150] Updated reference results * [lbl-srg/modelica-buildings@7390a2f 7390a2f] Added mos script * [lbl-srg/modelica-buildings@c7bd6ef c7bd6ef] Merged IBPSA, issue1275_romTraceSubstances * [lbl-srg/modelica-buildings@2d48e18 2d48e18] Regenerated reference results * [lbl-srg/modelica-buildings@0107f34 0107f34] Merged IBPSA, issue1275_romTraceSubstances
1 parent a48fc6a commit 5df0ad1

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

Makefile.libs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
.PHONY: ADGenKinetics ADMSL AdvancedNoise AixLib AlgebraTestSuite Annex60 ApproxSpline BioChem BondGraph BondLib BrineProp BuildSysPro BuildingControlLib BuildingSystems Buildings Chemical ComplexLib ConPNlib DESLib DeployStructLib DisHeatLib DriveControl EMOTH ElectricalEnergyStorage ElectroMechanicalDrives ExtendedPetriNets ExternData ExternalMedia ExternalMemoryLib FCSys FMITest FailureModes FastBuildings FaultTriggering FeedDriveLibrary FractionalOrder FuzzyControl Greenhouses-Library HanserModelica HelmholtzMedia IdealizedContact IndustrialControlSystems InstantaneousSymmetricalComponents KeyWordIO LibRAS LinearMPC ManualTracking ModPowerSystems Modelica Modelica-Arduino Modelica-GNU_ScientificLibrary Modelica-MVEM ModelicaADS ModelicaAdditions ModelicaBook ModelicaCompliance ModelicaDEVS ModelicaDFR ModelicaTutorials Modelica_DeviceDrivers Modelica_LinearSystems2 Modelica_Requirements Modelica_StateGraph2 Modelica_Synchronous MotorcycleDynamics MultiPhaseMixtureMedia NCLib NeuralNetwork Noise ObjectStab OpenHydraulics OpenIPSL Optimisers PNlib PVSystems PhotoVoltaics Physiolibrary Physiomodel PlanarMechanics PowerFlow PowerGrids PowerSystems PowerSystems-latest PraxisSimulationstechnik QSSFluidFlow RealTimeCoordinationLibrary SMEHV ScalableTestSuite Servomechanisms SiemensPower SolarTherm Soltermica Spot SystemDynamics ThermalSeparation ThermoPower ThermoSysPro VVDRlib VehicleInterfaces WasteWater Wavelet WindPowerPlants XogenyTest ipsl modelica-flight msgpack-modelica netCDF-DataReader open-bldc-modelica openfdm pow_el
2-
CORE_TARGET=$(BUILD_DIR)/20200430_190743.core
3-
ALL_TARGET=$(BUILD_DIR)/20200430_190743.all
2+
CORE_TARGET=$(BUILD_DIR)/20200501_191030.core
3+
ALL_TARGET=$(BUILD_DIR)/20200501_191030.all
44
CORE_LIBS=BioChem Modelica Modelica_DeviceDrivers Modelica_Synchronous SiemensPower ThermoPower ThermoSysPro VVDRlib WasteWater
55
OTHER_LIBS=ADGenKinetics ADMSL AdvancedNoise AixLib AlgebraTestSuite Annex60 ApproxSpline BondGraph BondLib BrineProp BuildSysPro BuildingControlLib BuildingSystems Buildings Chemical ComplexLib ConPNlib DESLib DeployStructLib DisHeatLib DriveControl EMOTH ElectricalEnergyStorage ElectroMechanicalDrives ExtendedPetriNets ExternData ExternalMedia ExternalMemoryLib FCSys FMITest FailureModes FastBuildings FaultTriggering FeedDriveLibrary FractionalOrder FuzzyControl Greenhouses-Library HanserModelica HelmholtzMedia IdealizedContact IndustrialControlSystems InstantaneousSymmetricalComponents KeyWordIO LibRAS LinearMPC ManualTracking ModPowerSystems Modelica-Arduino Modelica-GNU_ScientificLibrary Modelica-MVEM ModelicaADS ModelicaAdditions ModelicaBook ModelicaCompliance ModelicaDEVS ModelicaDFR ModelicaTutorials Modelica_LinearSystems2 Modelica_Requirements Modelica_StateGraph2 MotorcycleDynamics MultiPhaseMixtureMedia NCLib NeuralNetwork Noise ObjectStab OpenHydraulics OpenIPSL Optimisers PNlib PVSystems PhotoVoltaics Physiolibrary Physiomodel PlanarMechanics PowerFlow PowerGrids PowerSystems PowerSystems-latest PraxisSimulationstechnik QSSFluidFlow RealTimeCoordinationLibrary SMEHV ScalableTestSuite Servomechanisms SolarTherm Soltermica Spot SystemDynamics ThermalSeparation VehicleInterfaces Wavelet WindPowerPlants XogenyTest ipsl modelica-flight msgpack-modelica netCDF-DataReader open-bldc-modelica openfdm pow_el
66
ALL_LIBS=$(CORE_LIBS) $(OTHER_LIBS)
77

8-
TIMESTAMP=20200430_190743
8+
TIMESTAMP=20200501_191030
99
ADGenKinetics:
1010
# Building git/ADGenKinetics
1111
./checkout-git.sh 'git/ADGenKinetics' 'https://github.com/modelica-3rdparty/ADGenKinetics.git' 'master' '9bdfd968c5b85609956aa9929be8a6b8027b22cf'
@@ -60,12 +60,12 @@ AlgebraTestSuite:
6060
echo '20180128-224601~git~master' > "$(BUILD_DIR)/AlgebraTestSuite.last_change"
6161
Annex60:
6262
# Building git/Annex60
63-
./checkout-git.sh 'git/Annex60' 'https://github.com/ibpsa/modelica.git' 'master' 'cbb25fd8c529a0dad1551869299ccbc2ddea0056'
63+
./checkout-git.sh 'git/Annex60' 'https://github.com/ibpsa/modelica.git' 'master' '3dd79c1f403eeb5ff908c060b6735e948b7a20ee'
6464
test ! -d 'build//IBPSA latest'
6565
cp -a 'git/Annex60/IBPSA' "$(BUILD_DIR)/IBPSA latest"
6666
echo 'Modelica 3.2.3' >> "$(BUILD_DIR)/IBPSA latest.uses"
6767
echo 'buildings' > "$(BUILD_DIR)/IBPSA latest.license"
68-
echo '20200428-190555~git~master' > "$(BUILD_DIR)/IBPSA latest.last_change"
68+
echo '20200430-165555~git~master' > "$(BUILD_DIR)/IBPSA latest.last_change"
6969
# Building git/Annex60
7070
./checkout-git.sh 'git/Annex60' 'https://github.com/ibpsa/modelica.git' 'v1.0.0' 'v1.0.0'
7171
test ! -d 'build//Annex60 1.0.0'
@@ -151,12 +151,12 @@ BuildingSystems:
151151
echo '2.0.0-beta2-341-g9cd9c73' > "$(BUILD_DIR)/BuildingSystems 2.0.0-beta.last_change"
152152
Buildings:
153153
# Building git/Buildings
154-
./checkout-git.sh 'git/Buildings' 'https://github.com/lbl-srg/modelica-buildings.git' 'master' 'd456cb7e34aef69df94eb631f9b925ed017a7875'
154+
./checkout-git.sh 'git/Buildings' 'https://github.com/lbl-srg/modelica-buildings.git' 'master' '1174166a4c62690df6eb167eba6ed807aeddc8bd'
155155
test ! -d 'build//Buildings latest'
156156
cp -a 'git/Buildings/Buildings' "$(BUILD_DIR)/Buildings latest"
157157
echo 'Modelica 3.2.3' >> "$(BUILD_DIR)/Buildings latest.uses"
158158
echo 'buildings' > "$(BUILD_DIR)/Buildings latest.license"
159-
echo '20200429-173323~git~master' > "$(BUILD_DIR)/Buildings latest.last_change"
159+
echo '20200501-082751~git~master' > "$(BUILD_DIR)/Buildings latest.last_change"
160160
# Building git/Buildings
161161
./checkout-git.sh 'git/Buildings' 'https://github.com/lbl-srg/modelica-buildings.git' 'v1.4_build1' 'v1.4_build1'
162162
test ! -d 'build//Buildings 1.4'
@@ -945,7 +945,7 @@ PowerSystems:
945945
./checkout-git.sh 'git/PowerSystems' 'https://github.com/modelica/PowerSystems.git' 'release' 'df65a5460f811f7053b69f2abd864482d461d379'
946946
test ! -d 'build//PowerSystems 1.0.0'
947947
cp -a 'git/PowerSystems/PowerSystems 1.0.0' "$(BUILD_DIR)/PowerSystems 1.0.0"
948-
echo 'Modelica 3.2.2' >> "$(BUILD_DIR)/PowerSystems 1.0.0.uses"
948+
echo '' > "$(BUILD_DIR)/PowerSystems 1.0.0.uses"
949949
echo 'modelica2' > "$(BUILD_DIR)/PowerSystems 1.0.0.license"
950950
echo '1.0.0-4-gdf65a54' > "$(BUILD_DIR)/PowerSystems 1.0.0.last_change"
951951
PowerSystems-latest:

repos.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
"gitbranch": "master",
135135
"license": "buildings"
136136
},
137-
"rev": "cbb25fd8c529a0dad1551869299ccbc2ddea0056",
137+
"rev": "3dd79c1f403eeb5ff908c060b6735e948b7a20ee",
138138
"targets": [
139139
"IBPSA latest"
140140
]
@@ -234,7 +234,7 @@
234234
"gitbranch": "master",
235235
"license": "buildings"
236236
},
237-
"rev": "d456cb7e34aef69df94eb631f9b925ed017a7875",
237+
"rev": "1174166a4c62690df6eb167eba6ed807aeddc8bd",
238238
"targets": [
239239
"Buildings latest"
240240
]

0 commit comments

Comments
 (0)