Skip to content

Commit 8e3e432

Browse files
Bump libraries
- https://github.com/ibpsa/modelica.git branch master updated to 775ac39b7db0fa2e09abf1a2e0475b98024f60c1. * [ibpsa/modelica-ibpsa@775ac39 775ac39] Merge pull request #1337 from ibpsa/issue1336_iconFourport * [ibpsa/modelica-ibpsa@fdc97cc fdc97cc] Reformatted code * [ibpsa/modelica-ibpsa@4219067 4219067] Removed arrow at inlet and aligned with grid [ci skip] * [ibpsa/modelica-ibpsa@b53be5f b53be5f] Merge branch 'master' into issue1336_iconFourport * [ibpsa/modelica-ibpsa@c8d234d c8d234d] udpated arrow locations for #1336 * [ibpsa/modelica-ibpsa@05f374d 05f374d] Merge branch 'master' into issue1336_iconFourport * [ibpsa/modelica-ibpsa@d5c6b35 d5c6b35] more icon changes for #1336 * [ibpsa/modelica-ibpsa@e1b146c e1b146c] revised icon layout for #1336 * [ibpsa/modelica-ibpsa@00d6b8f 00d6b8f] added flow direction indicators to PartialFourPort for #1336
1 parent 5df0ad1 commit 8e3e432

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

Makefile.libs

Lines changed: 6 additions & 6 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)/20200501_191030.core
3-
ALL_TARGET=$(BUILD_DIR)/20200501_191030.all
2+
CORE_TARGET=$(BUILD_DIR)/20200502_190713.core
3+
ALL_TARGET=$(BUILD_DIR)/20200502_190713.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=20200501_191030
8+
TIMESTAMP=20200502_190713
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' '3dd79c1f403eeb5ff908c060b6735e948b7a20ee'
63+
./checkout-git.sh 'git/Annex60' 'https://github.com/ibpsa/modelica.git' 'master' '775ac39b7db0fa2e09abf1a2e0475b98024f60c1'
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 '20200430-165555~git~master' > "$(BUILD_DIR)/IBPSA latest.last_change"
68+
echo '20200501-115523~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'
@@ -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 '' > "$(BUILD_DIR)/PowerSystems 1.0.0.uses"
948+
echo 'Modelica 3.2.2' >> "$(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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
"gitbranch": "master",
135135
"license": "buildings"
136136
},
137-
"rev": "3dd79c1f403eeb5ff908c060b6735e948b7a20ee",
137+
"rev": "775ac39b7db0fa2e09abf1a2e0475b98024f60c1",
138138
"targets": [
139139
"IBPSA latest"
140140
]

0 commit comments

Comments
 (0)