diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java index 6279145..df90085 100644 --- a/_alp/Agents/Zero_Interface/Code/Functions.java +++ b/_alp/Agents/Zero_Interface/Code/Functions.java @@ -3727,9 +3727,12 @@ List f_getMainInterfaceSliderEAGCs() //Find the energy production slider gcs that are not specificly for the EnergyHub List electricityTabEASliderGCs_prod = findAll(energyModel.EnergyProductionSites, sliderProd -> - sliderProd.p_isSliderGC && - !sliderProd.p_gridConnectionID.equals(p_defaultEnergyHubSliderGCName_solarfarm) && - !sliderProd.p_gridConnectionID.equals(p_defaultEnergyHubSliderGCName_windfarm)); + sliderProd.p_isSliderGC && + !sliderProd.p_gridConnectionID.equals(p_defaultEnergyHubSliderGCName_solarfarm) && + !sliderProd.p_gridConnectionID.equals(p_defaultEnergyHubSliderGCName_windfarm)); + +//traceln("electricityTabEASliderGCs_prod.size(): %s", electricityTabEASliderGCs_prod.size()); + if(electricityTabEASliderGCs_prod.size() == 2){ electricityTabEASliderGCs.addAll(electricityTabEASliderGCs_prod); } diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java index 3d807ad..0ba5303 100644 --- a/_alp/Agents/Zero_Loader/Code/Functions.java +++ b/_alp/Agents/Zero_Loader/Code/Functions.java @@ -40,14 +40,16 @@ double f_configureEngine_default() {/*ALCODESTART::1726584205773*/ +//Engine time-date variables +energyModel.p_runStartTime_h = v_simStartHour_h; +energyModel.p_runEndTime_h = v_simStartHour_h + v_simDuration_h; +energyModel.f_initializeTimeDates(); + //Set basic input files energyModel.p_truckTripsCsv = inputCSVtruckTrips; energyModel.p_householdTripsCsv = inputCSVhouseholdTrips; energyModel.p_cookingPatternCsv = inputCSVcookingActivities; -//Initialize specific slider GC -f_initializeSpecificSliderGC(); - //Actors f_createActors(); @@ -58,6 +60,9 @@ f_removeObjectsNotInActiveNBH(); } +//Initialize specific slider GC +f_initializeSpecificSliderGC(); + //Grid nodes f_createGridNodes(); @@ -68,8 +73,7 @@ f_createAdditionalGISObjects(); //Initialize the engine -energyModel.p_runStartTime_h = v_simStartHour_h; -energyModel.p_runEndTime_h = v_simStartHour_h + v_simDuration_h; + energyModel.f_initializeEngine(); /*ALCODEEND*/}