-
Notifications
You must be signed in to change notification settings - Fork 160
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
+ move code for max age balancing to SimulationParameters
+ update simulation parameters properly in loading flashbacks
- Loading branch information
Showing
17 changed files
with
165 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| #include "SimulationParametersService.cuh" | ||
|
|
||
| #include <vector> | ||
|
|
||
| #include "EngineInterface/SimulationParameters.h" | ||
| #include "EngineInterface/SpaceCalculator.h" | ||
|
|
||
| #include "Base.cuh" | ||
| #include "SimulationData.cuh" | ||
| #include "MaxAgeBalancer.cuh" | ||
|
|
||
| SimulationParameters SimulationParametersService::integrateChanges( | ||
| SimulationParameters const& currentParameters, | ||
| SimulationParameters const& changedParameters, | ||
| SimulationParametersUpdateConfig const& updateConfig) const | ||
| { | ||
| auto result = changedParameters; | ||
|
|
||
| if (updateConfig == SimulationParametersUpdateConfig::AllExceptChangingPositions) { | ||
| auto numSpots = std::min(currentParameters.numSpots, changedParameters.numSpots); | ||
| for (int i = 0; i < numSpots; ++i) { | ||
| if (currentParameters.spots[i].velX != 0) { | ||
| result.spots[i].posX = currentParameters.spots[i].posX; | ||
| } | ||
| if (currentParameters.spots[i].velY != 0) { | ||
| result.spots[i].posY = currentParameters.spots[i].posY; | ||
| } | ||
| } | ||
|
|
||
| auto numRadiationSources = std::min(currentParameters.numRadiationSources, changedParameters.numRadiationSources); | ||
| for (int i = 0; i < numRadiationSources; ++i) { | ||
| if (currentParameters.radiationSources[i].velX != 0) { | ||
| result.radiationSources[i].posX = currentParameters.radiationSources[i].posX; | ||
| } | ||
| if (currentParameters.spots[i].velY != 0) { | ||
| result.radiationSources[i].posY = currentParameters.radiationSources[i].posY; | ||
| } | ||
| } | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| bool SimulationParametersService::updateSimulationParametersAfterTimestep( | ||
| Settings& settings, | ||
| MaxAgeBalancer const& maxAgeBalancer, | ||
| SimulationData const& simulationData, | ||
| RawStatisticsData const& statistics) | ||
| { | ||
| auto result = false; | ||
|
|
||
| auto const& worldSizeX = settings.generalSettings.worldSizeX; | ||
| auto const& worldSizeY = settings.generalSettings.worldSizeY; | ||
| SpaceCalculator space({worldSizeX, worldSizeY}); | ||
| for (int i = 0; i < settings.simulationParameters.numRadiationSources; ++i) { | ||
| auto& source = settings.simulationParameters.radiationSources[i]; | ||
| if (abs(source.velX) > NEAR_ZERO) { | ||
| source.posX += source.velX * settings.simulationParameters.timestepSize; | ||
| result = true; | ||
| } | ||
| if (abs(source.velY) > NEAR_ZERO) { | ||
| source.posY += source.velY * settings.simulationParameters.timestepSize; | ||
| result = true; | ||
| } | ||
| auto correctedPosition = space.getCorrectedPosition({source.posX, source.posY}); | ||
| source.posX = correctedPosition.x; | ||
| source.posY = correctedPosition.y; | ||
| } | ||
| for (int i = 0; i < settings.simulationParameters.numSpots; ++i) { | ||
| auto& spot = settings.simulationParameters.spots[i]; | ||
| if (abs(spot.velX) > NEAR_ZERO) { | ||
| spot.posX += spot.velX * settings.simulationParameters.timestepSize; | ||
| result = true; | ||
| } | ||
| if (abs(spot.velY) > NEAR_ZERO) { | ||
| spot.posY += spot.velY * settings.simulationParameters.timestepSize; | ||
| result = true; | ||
| } | ||
| auto correctedPosition = space.getCorrectedPosition({spot.posX, spot.posY}); | ||
| spot.posX = correctedPosition.x; | ||
| spot.posY = correctedPosition.y; | ||
| } | ||
|
|
||
| auto externalEnergyPresent = settings.simulationParameters.externalEnergy > 0; | ||
| for (int i = 0; i < MAX_COLORS; ++i) { | ||
| externalEnergyPresent |= settings.simulationParameters.externalEnergyBackflowFactor[i] > 0; | ||
| } | ||
| externalEnergyPresent &= settings.simulationParameters.features.externalEnergyControl; | ||
| if (externalEnergyPresent) { | ||
| double temp; | ||
| CHECK_FOR_CUDA_ERROR(cudaMemcpy(&temp, simulationData.externalEnergy, sizeof(double), cudaMemcpyDeviceToHost)); | ||
| settings.simulationParameters.externalEnergy = toFloat(temp); | ||
| result = true; | ||
| } | ||
|
|
||
| result |= maxAgeBalancer->balance(settings.simulationParameters, statistics, simulationData.timestep); | ||
|
|
||
| return result; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #include <optional> | ||
|
|
||
| #include "Base/Singleton.h" | ||
|
|
||
| #include "EngineInterface/RawStatisticsData.h" | ||
| #include "EngineInterface/Settings.h" | ||
| #include "EngineInterface/SimulationParametersUpdateConfig.h" | ||
|
|
||
| #include "Definitions.cuh" | ||
|
|
||
| class SimulationParametersService | ||
| { | ||
| MAKE_SINGLETON(SimulationParametersService); | ||
|
|
||
| public: | ||
| SimulationParameters integrateChanges( | ||
| SimulationParameters const& currentParameters, | ||
| SimulationParameters const& changedParameters, | ||
| SimulationParametersUpdateConfig const& updateConfig) const; | ||
|
|
||
| bool updateSimulationParametersAfterTimestep( | ||
| Settings& settings, | ||
| MaxAgeBalancer const& maxAgeBalancer, | ||
| SimulationData const& simulationData, | ||
| RawStatisticsData const& statistics); //returns true if parameters have been changed | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.