From fc6f4a091d6a7e131dad67afc7f4f75b0d87c9eb Mon Sep 17 00:00:00 2001 From: Sree Vidhya <66103871+vidhya001@users.noreply.github.com> Date: Sun, 2 May 2021 12:21:47 +0530 Subject: [PATCH 1/2] Update spatialtiledlocaldomaincontroller.cpp Signed-off-by: Sree Vidhya <66103871+vidhya001@users.noreply.github.com> --- .../src/spatialtiledlocaldomaincontroller.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp b/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp index 6ac1ca7..3d1ebdb 100644 --- a/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp +++ b/Source/moja.flint/src/spatialtiledlocaldomaincontroller.cpp @@ -845,6 +845,15 @@ bool SpatialTiledLocalDomainController::runCellSpinUp(std::shared_ptr_landUnitArea = _provider->area(cell); + _landUnitController.getVariable("landUnitArea")->set_value(_spatiallocationinfo->_landUnitArea); + +} + // -------------------------------------------------------------------------------------------- bool SpatialTiledLocalDomainController::runCell(std::shared_ptr& blockStatsUnit, @@ -899,10 +908,9 @@ bool SpatialTiledLocalDomainController::runCell(std::shared_ptr blockStatsUnit->_unitsNotProcessed++; return true; } - _landUnitController.initialiseData(true); - _spatiallocationinfo->_landUnitArea = _provider->area(cell); - _landUnitController.getVariable("landUnitArea")->set_value(_spatiallocationinfo->_landUnitArea); + SpatialTiledLocalDomainController::simulateLandUnitArea(cell); + blockStatsUnit->_stopWatchSpinup.start(); blockStatsSpinUpUnit->_stopWatchTotal.start(); From 80d7c6ff978c0127948f8572302f6aa9a69fe6c9 Mon Sep 17 00:00:00 2001 From: Sree Vidhya <66103871+vidhya001@users.noreply.github.com> Date: Sun, 2 May 2021 12:23:13 +0530 Subject: [PATCH 2/2] Update spatialtiledlocaldomaincontroller.h Signed-off-by: Sree Vidhya <66103871+vidhya001@users.noreply.github.com> --- .../include/moja/flint/spatialtiledlocaldomaincontroller.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/moja.flint/include/moja/flint/spatialtiledlocaldomaincontroller.h b/Source/moja.flint/include/moja/flint/spatialtiledlocaldomaincontroller.h index 75ab107..ab7ceba 100644 --- a/Source/moja.flint/include/moja/flint/spatialtiledlocaldomaincontroller.h +++ b/Source/moja.flint/include/moja/flint/spatialtiledlocaldomaincontroller.h @@ -184,7 +184,7 @@ class FLINT_API SpatialTiledLocalDomainController : public LocalDomainController bool runCell(std::shared_ptr& blockStatsUnit, std::shared_ptr& blockStatsSpinUpUnit, const datarepository::CellIdx& cell); bool runCellSpinUp(std::shared_ptr& blockStatsUnit, const datarepository::CellIdx& cell); - + void simulateLandUnitArea(const datarepository::CellIdx& cell); // -- Utility methods typedef Poco::Tuple RunSummaryDataRecord; @@ -195,4 +195,4 @@ class FLINT_API SpatialTiledLocalDomainController : public LocalDomainController } // namespace flint } // namespace moja -#endif // MOJA_FLINT_SPATIALTILEDLOCALDOMAINCONTROLLER_H_ \ No newline at end of file +#endif // MOJA_FLINT_SPATIALTILEDLOCALDOMAINCONTROLLER_H_