Skip to content

Re order of engine initialisation; time vars first #215

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

Merged
GillisHommen merged 4 commits into from
Jan 7, 2026
Merged

Re order of engine initialisation; time vars first #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08a2501
Pulled forward initialisation of Time/Date in engine, before creation…
GillisHommen Dec 31, 2025
c51656f
Re-order of f_initializeSpecificSliderGC() in f_configureEngine_defau…
GillisHommen Jan 5, 2026
bedf84e
Merge branch 'main' into Re-order-or-engine-initialisation;-time-vars…
GillisHommen Jan 5, 2026
b549eeb
Merge branch 'main' into Re-order-or-engine-initialisation;-time-vars…
AteZenmo Jan 6, 2026
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
9 changes: 6 additions & 3 deletions _alp/Agents/Zero_Interface/Code/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3727,9 +3727,12 @@ List<GridConnection> f_getMainInterfaceSliderEAGCs()

//Find the energy production slider gcs that are not specificly for the EnergyHub
List<GCEnergyProduction> 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);
}
Expand Down
14 changes: 9 additions & 5 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 @@ -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();

Expand All @@ -58,6 +60,9 @@
f_removeObjectsNotInActiveNBH();
}

//Initialize specific slider GC
f_initializeSpecificSliderGC();

//Grid nodes
f_createGridNodes();

Expand All @@ -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*/}
Expand Down