From 0d3ae7d63341725e36a4a5963bd53aa9e7d888a3 Mon Sep 17 00:00:00 2001
From: Gareth Tribello <gareth.tribello@gmail.com>
Date: Wed, 10 Feb 2016 08:24:52 +0000
Subject: [PATCH] Fixed problem with FindContour when outputting grid
N.B. Change to ActionPilot.h just makes getStride a public
rather than protected method.
---
src/core/ActionPilot.h | 3 ++-
src/gridtools/ActionWithInputGrid.cpp | 5 +++++
src/gridtools/FindContour.cpp | 2 +-
src/gridtools/GridVessel.cpp | 6 +++++-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/core/ActionPilot.h b/src/core/ActionPilot.h
index a4a1d74a0..9065312e3 100644
--- a/src/core/ActionPilot.h
+++ b/src/core/ActionPilot.h
@@ -41,7 +41,6 @@ class ActionPilot:
{
int stride; // multiple time step
protected:
- int getStride()const;
void setStride( const unsigned& ss );
public:
explicit ActionPilot(const ActionOptions&);
@@ -49,6 +48,8 @@ public:
static void registerKeywords(Keywords& keys);
/// Check if the action is active on this step
bool onStep()const;
+/// Get the stride
+ int getStride()const;
};
}
diff --git a/src/gridtools/ActionWithInputGrid.cpp b/src/gridtools/ActionWithInputGrid.cpp
index 7f20c59c4..d29153c4c 100644
--- a/src/gridtools/ActionWithInputGrid.cpp
+++ b/src/gridtools/ActionWithInputGrid.cpp
@@ -48,6 +48,11 @@ mygrid(NULL)
if(!mves) error("action labelled " + mlab + " does not exist or does not have vessels");
addDependency(mves);
+ ActionPilot* ap=dynamic_cast<ActionPilot*>( mves );
+ if( ap ){
+ if( getStride()!=ap->getStride() ) error("mismatch between strides in " + ap->getLabel() + " and " + getLabel() );
+ }
+
log.printf(" using grid calculated by action %s \n",mves->getLabel().c_str() );
for(unsigned i=0;i<mves->getNumberOfVessels();++i){
mygrid=dynamic_cast<GridVessel*>( mves->getPntrToVessel(i) );
diff --git a/src/gridtools/FindContour.cpp b/src/gridtools/FindContour.cpp
index 99259c95d..2aff20ad2 100644
--- a/src/gridtools/FindContour.cpp
+++ b/src/gridtools/FindContour.cpp
@@ -139,7 +139,6 @@ outgrid(NULL)
vesselbase::VesselOptions dar( da, keys );
outgrid = new GridFunction(dar); addVessel( outgrid );
if( mygrid->noDerivatives() ) outgrid->setNoDerivatives();
- resizeFunctions();
}
// START OF BIT TO IMPROVE
@@ -204,6 +203,7 @@ void FindContour::performOperationsWithGrid( const bool& from_update ){
snbins[i]=mygrid->getNbin()[gdirs[i]];
}
outgrid->setBounds( smin, smax, snbins, fspacing);
+ resizeFunctions();
}
// Run over whole grid
diff --git a/src/gridtools/GridVessel.cpp b/src/gridtools/GridVessel.cpp
index 0db5abb29..ec4110830 100644
--- a/src/gridtools/GridVessel.cpp
+++ b/src/gridtools/GridVessel.cpp
@@ -120,7 +120,11 @@ std::string GridVessel::description(){
void GridVessel::resize(){
plumed_massert( nper>0, "Number of datapoints at each grid point has not been set");
- resizeBuffer( npoints*nper ); data.resize( npoints*nper, 0 ); active.resize( npoints, true );
+ resizeBuffer( npoints*nper );
+ if( data.size()!=npoints*nper ){
+ data.resize( npoints*nper, 0 );
+ active.resize( npoints, true );
+ }
}
unsigned GridVessel::getIndex( const std::vector<unsigned>& indices ) const {
--
GitLab