Skip to content

Commit

Permalink
Bump libraries
Browse files Browse the repository at this point in the history
- https://github.com/ibpsa/modelica.git branch master updated to ff8ec1e2cccd08c5cacfe223a87d407d9ad868f5.
  * [ibpsa/modelica-ibpsa@ff8ec1e ff8ec1e] Corrected units and html syntax
  * [ibpsa/modelica-ibpsa@a80764b a80764b] Merge branch 'master' into issue1393_derivativePsychrometrics
  * [ibpsa/modelica-ibpsa@67a66b7 67a66b7] Corrected argument names

- https://github.com/lbl-srg/modelica-buildings.git branch master updated to 61cfd3362684e4052319b4c40c6d0660561c6980.
  * [lbl-srg/modelica-buildings@61cfd33 61cfd33] Merge pull request #2135 from lbl-srg/IBPSASync
  * [lbl-srg/modelica-buildings@7bac9d0 7bac9d0] Corrected units and html syntax
  * [lbl-srg/modelica-buildings@f02747c f02747c] Merged IBPSA, lbl-srg/BuildingsPy#376

- https://github.com/SolarTherm/SolarTherm.git branch master updated to 0dc31516f857ebf0e0ac49c7934887d9bfbcbed1.
  * [SolarTherm/SolarTherm@0dc3151 0dc3151] get oelt and A_land for a known field
  * [SolarTherm/SolarTherm@9490b05 9490b05] add an option to simulate oelt from a known field
  • Loading branch information
OpenModelica-Hudson committed Sep 14, 2020
1 parent ee2ffcd commit 2ee8334
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions Makefile.libs
Original file line number Diff line number Diff line change
@@ -1,11 +1,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 MEV 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
CORE_TARGET=$(BUILD_DIR)/20200912_190906.core
ALL_TARGET=$(BUILD_DIR)/20200912_190906.all
CORE_TARGET=$(BUILD_DIR)/20200914_192600.core
ALL_TARGET=$(BUILD_DIR)/20200914_192600.all
CORE_LIBS=BioChem Modelica Modelica_DeviceDrivers Modelica_Synchronous SiemensPower ThermoPower ThermoSysPro VVDRlib WasteWater
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 MEV 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
ALL_LIBS=$(CORE_LIBS) $(OTHER_LIBS)

TIMESTAMP=20200912_190906
TIMESTAMP=20200914_192600
ADGenKinetics:
# Building git/ADGenKinetics
./checkout-git.sh 'git/ADGenKinetics' 'https://github.com/modelica-3rdparty/ADGenKinetics.git' 'master' '9bdfd968c5b85609956aa9929be8a6b8027b22cf'
Expand Down Expand Up @@ -60,12 +60,12 @@ AlgebraTestSuite:
echo '20180128-224601~git~master' > "$(BUILD_DIR)/AlgebraTestSuite.last_change"
Annex60:
# Building git/Annex60
./checkout-git.sh 'git/Annex60' 'https://github.com/ibpsa/modelica.git' 'master' 'a636da7b8f523f5d2be114e1ff798cdcd1f4ec0a'
./checkout-git.sh 'git/Annex60' 'https://github.com/ibpsa/modelica.git' 'master' 'ff8ec1e2cccd08c5cacfe223a87d407d9ad868f5'
test ! -d 'build//IBPSA latest'
cp -a 'git/Annex60/IBPSA' "$(BUILD_DIR)/IBPSA latest"
echo 'Modelica 3.2.3' >> "$(BUILD_DIR)/IBPSA latest.uses"
echo 'buildings' > "$(BUILD_DIR)/IBPSA latest.license"
echo '20200912-093840~git~master' > "$(BUILD_DIR)/IBPSA latest.last_change"
echo '20200913-070126~git~master' > "$(BUILD_DIR)/IBPSA latest.last_change"
# Building git/Annex60
./checkout-git.sh 'git/Annex60' 'https://github.com/ibpsa/modelica.git' 'v1.0.0' 'v1.0.0'
test ! -d 'build//Annex60 1.0.0'
Expand Down Expand Up @@ -151,12 +151,12 @@ BuildingSystems:
echo '2.0.0-beta2-351-g76ea850' > "$(BUILD_DIR)/BuildingSystems 2.0.0-beta.last_change"
Buildings:
# Building git/Buildings
./checkout-git.sh 'git/Buildings' 'https://github.com/lbl-srg/modelica-buildings.git' 'master' '361377912475de87b01babfeb66a9331f32e7d44'
./checkout-git.sh 'git/Buildings' 'https://github.com/lbl-srg/modelica-buildings.git' 'master' '61cfd3362684e4052319b4c40c6d0660561c6980'
test ! -d 'build//Buildings latest'
cp -a 'git/Buildings/Buildings' "$(BUILD_DIR)/Buildings latest"
echo 'Modelica 3.2.3' >> "$(BUILD_DIR)/Buildings latest.uses"
echo 'buildings' > "$(BUILD_DIR)/Buildings latest.license"
echo '20200909-151651~git~master' > "$(BUILD_DIR)/Buildings latest.last_change"
echo '20200914-051207~git~master' > "$(BUILD_DIR)/Buildings latest.last_change"
# Building git/Buildings
./checkout-git.sh 'git/Buildings' 'https://github.com/lbl-srg/modelica-buildings.git' 'v1.4_build1' 'v1.4_build1'
test ! -d 'build//Buildings 1.4'
Expand Down Expand Up @@ -1058,12 +1058,12 @@ SiemensPower:
echo '2.2-20160429-215511~git~master' > "$(BUILD_DIR)/SiemensPower 2.2.last_change"
SolarTherm:
# Building git/SolarTherm
./checkout-git.sh 'git/SolarTherm' 'https://github.com/SolarTherm/SolarTherm.git' 'master' '04766a8eb39a8e8315fb55d7ec9e0e9050b16983'
./checkout-git.sh 'git/SolarTherm' 'https://github.com/SolarTherm/SolarTherm.git' 'master' '0dc31516f857ebf0e0ac49c7934887d9bfbcbed1'
test ! -d 'build//SolarTherm 0.2'
cp -a 'git/SolarTherm/SolarTherm' "$(BUILD_DIR)/SolarTherm 0.2"
echo 'Modelica 3.2.2' >> "$(BUILD_DIR)/SolarTherm 0.2.uses"
echo 'modelica2' > "$(BUILD_DIR)/SolarTherm 0.2.license"
echo '0.2-20200811-200903~git~master' > "$(BUILD_DIR)/SolarTherm 0.2.last_change"
echo '0.2-20200914-203807~git~master' > "$(BUILD_DIR)/SolarTherm 0.2.last_change"
Soltermica:
# Building git/Soltermica
./checkout-git.sh 'git/Soltermica' 'https://github.com/modelica-3rdparty/Soltermica.git' 'master' '9f7224bd89335f95dffe1ccdaa094df5a3279fdf'
Expand Down
6 changes: 3 additions & 3 deletions repos.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"gitbranch": "master",
"license": "buildings"
},
"rev": "a636da7b8f523f5d2be114e1ff798cdcd1f4ec0a",
"rev": "ff8ec1e2cccd08c5cacfe223a87d407d9ad868f5",
"targets": [
"IBPSA latest"
]
Expand Down Expand Up @@ -238,7 +238,7 @@
"gitbranch": "master",
"license": "buildings"
},
"rev": "361377912475de87b01babfeb66a9331f32e7d44",
"rev": "61cfd3362684e4052319b4c40c6d0660561c6980",
"targets": [
"Buildings latest"
]
Expand Down Expand Up @@ -1104,7 +1104,7 @@
"options": {
"gitbranch": "master"
},
"rev": "04766a8eb39a8e8315fb55d7ec9e0e9050b16983",
"rev": "0dc31516f857ebf0e0ac49c7934887d9bfbcbed1",
"targets": [
"SolarTherm"
],
Expand Down

0 comments on commit 2ee8334

Please sign in to comment.