Skip to content

Loader: remove unnecessary zero_loader dereferencing #290

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.

Sign up for GitHub

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

Open
Erikvv wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −11
Open

Loader: remove unnecessary zero_loader dereferencing #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions _alp/Agents/Zero_Loader/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2827,15 +2827,15 @@ boolean f_createElectricityTimeSeriesAssets(GridConnection gridConnection,com.ze
//Add primary heating asset (heatpump) (if its not part of the basic profile already
inputCapacityElectric_kW = max(avgc_data.p_minHeatpumpElectricCapacity_kW, maxHeatOutputPower_kW / 3); //-- /3, kan nog kleiner want is hybride zodat gasbrander ook bij springt, dus kleiner MOETEN aanname voor hoe klein onderzoeken
efficiency = avgc_data.p_avgEfficiencyHeatpump_fr;
baseTemperature_degC = zero_Interface.energyModel.pp_ambientTemperature_degC.getCurrentValue();
baseTemperature_degC = energyModel.pp_ambientTemperature_degC.getCurrentValue();
outputTemperature_degC = avgc_data.p_avgOutputTemperatureHybridHeatpump_degC;
ambientTempType = OL_AmbientTempType.AMBIENT_AIR;
sourceAssetHeatPower_kW = 0;
belowZeroHeatpumpEtaReductionFactor = 1;

J_EAConversionHeatPump heatPumpHybrid = new J_EAConversionHeatPump(parentGC, inputCapacityElectric_kW, efficiency, energyModel.p_timeParameters, outputTemperature_degC, baseTemperature_degC, sourceAssetHeatPower_kW, belowZeroHeatpumpEtaReductionFactor, ambientTempType);

zero_Interface.energyModel.c_ambientDependentAssets.add(heatPumpHybrid);
energyModel.c_ambientDependentAssets.add(heatPumpHybrid);

//Add secondary heating asset (gasburner)
heatOutputCapacityGasBurner_kW = max(avgc_data.p_minGasBurnerOutputCapacity_kW, maxHeatOutputPower_kW);
Expand All @@ -2849,7 +2849,7 @@ boolean f_createElectricityTimeSeriesAssets(GridConnection gridConnection,com.ze
//Add primary heating asset (heatpump)
inputCapacityElectric_kW = max(avgc_data.p_minHeatpumpElectricCapacity_kW, maxHeatOutputPower_kW); // Could be a lot smaller due to high cop
efficiency = avgc_data.p_avgEfficiencyHeatpump_fr;
baseTemperature_degC = zero_Interface.energyModel.pp_ambientTemperature_degC.getCurrentValue();
baseTemperature_degC = energyModel.pp_ambientTemperature_degC.getCurrentValue();
outputTemperature_degC = avgc_data.p_avgOutputTemperatureElectricHeatpump_degC;
ambientTempType = OL_AmbientTempType.AMBIENT_AIR;
sourceAssetHeatPower_kW = 0;
Expand Down Expand Up @@ -4538,7 +4538,7 @@ else if (surveyGC.getHeat() != null && surveyGC.getHeat().getAnnualDistrictHeati


/*
List<ConnectionOwner> c_COCompanies = findAll(zero_Interface.energyModel.pop_connectionOwners, p -> p.p_connectionOwnerType == OL_ConnectionOwnerType.COMPANY);
List<ConnectionOwner> c_COCompanies = findAll(energyModel.pop_connectionOwners, p -> p.p_connectionOwnerType == OL_ConnectionOwnerType.COMPANY);


int i = 0;
Expand Down Expand Up @@ -4686,9 +4686,9 @@ else if (surveyGC.getHeat() != null && surveyGC.getHeat().getAnnualDistrictHeati
//pauseSimulation();

// Collect GIS_Objects into hashmap, to link to new EnergyModel.
zero_Interface.energyModel.pop_GIS_Buildings.forEach(x->{c_GISregions.put(x.p_id, x.gisRegion);});
zero_Interface.energyModel.pop_GIS_Objects.forEach(x->{c_GISregions.put(x.p_id, x.gisRegion);});
zero_Interface.energyModel.pop_GIS_Parcels.forEach(x->{c_GISregions.put(x.p_id, x.gisRegion);});
energyModel.pop_GIS_Buildings.forEach(x->{c_GISregions.put(x.p_id, x.gisRegion);});
energyModel.pop_GIS_Objects.forEach(x->{c_GISregions.put(x.p_id, x.gisRegion);});
energyModel.pop_GIS_Parcels.forEach(x->{c_GISregions.put(x.p_id, x.gisRegion);});
pauseSimulation();
try {
v_objectMapper = new ObjectMapper();
Expand Down Expand Up @@ -4737,7 +4737,7 @@ else if (surveyGC.getHeat() != null && surveyGC.getHeat().getAnnualDistrictHeati
// get heatingTypeHashmap from 'old' energyModel.
deserializedEnergyModel.c_defaultHeatingStrategies = zero_Interface.energyModel.c_defaultHeatingStrategies;

zero_Interface.zero_loader.energyModel = deserializedEnergyModel;
this.energyModel = deserializedEnergyModel;
zero_Interface.energyModel = deserializedEnergyModel;
zero_Interface.uI_Results.energyModel = deserializedEnergyModel;
uI_Results.energyModel = deserializedEnergyModel;
Expand Down
6 changes: 3 additions & 3 deletions _alp/Agents/Zero_Loader/Levels/Level.level.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,13 +1191,13 @@ try {

// Get profilePointer tableFunctions from 'original' energyModel
deserializedEnergyModel.c_profiles.forEach(x-&gt;{
J_ProfilePointer origProfile = zero_Interface.energyModel.f_findProfile(x.name);
J_ProfilePointer origProfile = energyModel.f_findProfile(x.name);
x.setTableFunction(origProfile.getTableFunction());
});
// get heatingTypeHashmap from 'old' energyModel.
deserializedEnergyModel.c_defaultHeatingStrategies = zero_Interface.energyModel.c_defaultHeatingStrategies;
deserializedEnergyModel.c_defaultHeatingStrategies = energyModel.c_defaultHeatingStrategies;

energyModel = deserializedEnergyModel;
this.energyModel = deserializedEnergyModel;
zero_Interface.energyModel = deserializedEnergyModel;
zero_Interface.uI_Results.energyModel = deserializedEnergyModel;
//zero_Interface.f_clearSelectionAndSelectEnergyModel();
Expand Down