From 8dff78901b2b6110428f9a8ec9f5994e7244dc4e Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Thu, 4 Jan 2024 13:45:26 -0800 Subject: [PATCH] Replaced ModelicaServices --- IBPSA/Electrical/DC/Sources/Examples/PVSingleDiode.mo | 2 +- .../Validation/PVSingleDiodeRooftopBuildingValidation.mo | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/IBPSA/Electrical/DC/Sources/Examples/PVSingleDiode.mo b/IBPSA/Electrical/DC/Sources/Examples/PVSingleDiode.mo index 1827ae68a8..27bb9fbe8b 100644 --- a/IBPSA/Electrical/DC/Sources/Examples/PVSingleDiode.mo +++ b/IBPSA/Electrical/DC/Sources/Examples/PVSingleDiode.mo @@ -3,7 +3,7 @@ model PVSingleDiode "Example for the single-diode PV model" extends Modelica.Icons.Example; extends IBPSA.Electrical.DC.Sources.Validation.BaseClasses.partialPVValidation( - weaDat(filNam=ModelicaServices.ExternalReferences.loadResource( + weaDat(filNam=Modelica.Utilities.Files.loadResource( "modelica://IBPSA/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))); Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement(transformation(extent={{-56,-20},{-36,0}}))); diff --git a/IBPSA/Electrical/DC/Sources/Validation/PVSingleDiodeRooftopBuildingValidation.mo b/IBPSA/Electrical/DC/Sources/Validation/PVSingleDiodeRooftopBuildingValidation.mo index 53c136a159..72ceda8be4 100644 --- a/IBPSA/Electrical/DC/Sources/Validation/PVSingleDiodeRooftopBuildingValidation.mo +++ b/IBPSA/Electrical/DC/Sources/Validation/PVSingleDiodeRooftopBuildingValidation.mo @@ -4,7 +4,7 @@ model PVSingleDiodeRooftopBuildingValidation extends IBPSA.Electrical.DC.Sources.Validation.BaseClasses.partialPVValidation( HGloTil(H(start=100)), weaDat(filNam= - ModelicaServices.ExternalReferences.loadResource( + Modelica.Utilities.Files.loadResource( "modelica://IBPSA/Resources/Data/Electrical/DC/Sources/Validation/Weather_Berlin_rooftop.mos"))); extends Modelica.Icons.Example; @@ -42,7 +42,7 @@ model PVSingleDiodeRooftopBuildingValidation Modelica.Blocks.Sources.CombiTimeTable MeaDatPVPDC( tableOnFile=true, tableName="meaPV", - fileName=ModelicaServices.ExternalReferences.loadResource("modelica://IBPSA/Resources/Data/Electrical/DC/Sources/Validation/Measurement_data_rooftop_PV_validation.txt"), + fileName=Modelica.Utilities.Files.loadResource("modelica://IBPSA/Resources/Data/Electrical/DC/Sources/Validation/Measurement_data_rooftop_PV_validation.txt"), columns={2,3}, smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative, shiftTime=nDay - 1800)