Skip to content
Snippets Groups Projects
Commit c498fdac authored by Hkorb's avatar Hkorb
Browse files

some more cleanup

parent 17f42335
No related branches found
No related tags found
1 merge request!81fixed AL
...@@ -105,8 +105,8 @@ std::string path("."); ...@@ -105,8 +105,8 @@ std::string path(".");
std::string simulationName("DrivenCavityChim"); std::string simulationName("DrivenCavityChim");
const uint timeStepOut = 100; const uint timeStepOut = 10000;
const uint timeStepEnd = 500; const uint timeStepEnd = 250000;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
......
...@@ -80,12 +80,7 @@ void Simulation::init(SPtr<Parameter> para, SPtr<GridProvider> gridProvider, std ...@@ -80,12 +80,7 @@ void Simulation::init(SPtr<Parameter> para, SPtr<GridProvider> gridProvider, std
comm = vf::gpu::Communicator::getInstanz(); comm = vf::gpu::Communicator::getInstanz();
this->para = para; this->para = para;
printf("para ID %d, numProcs: %d, nDevices: %zd, devices: %d, maxDev: %d \n", para->getMyID(), para->getNumprocs(), para->getDevices().size(), para->getDevices()[0], para->getMaxDev()); devCheck(comm->mapCudaDevice(para->getMyID(), para->getNumprocs(), para->getDevices(), para->getMaxDev()));
printf("comm numproces %d, pid %d \n", comm->getNummberOfProcess(), comm->getPID());
int dev = comm->mapCudaDevice(para->getMyID(), para->getNumprocs(), para->getDevices(), para->getMaxDev());
printf("dev: %d \n", dev);
int devcheck = devCheck(dev);
printf("devcheck return: %d", devcheck);
para->initLBMSimulationParameter(); para->initLBMSimulationParameter();
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <curand_kernel.h> #include <curand_kernel.h>
#include "Core/StringUtilities/StringUtil.h" #include "Core/StringUtilities/StringUtil.h"
#include <basics/config/ConfigurationFile.h> #include <basics/config/ConfigurationFile.h>
...@@ -2461,7 +2462,6 @@ std::string Parameter::getADKernel() ...@@ -2461,7 +2462,6 @@ std::string Parameter::getADKernel()
{ {
return adKernel; return adKernel;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void Parameter::setInitialCondition(std::function<void(real,real,real,real&,real&,real&,real&)> initialCondition) void Parameter::setInitialCondition(std::function<void(real,real,real,real&,real&,real&,real&)> initialCondition)
......
#ifndef Probe_H #ifndef Probe_H
#define Probe_H #define Probe_H
#include <cuda.h>
#include "Visitor/Visitor.h" #include "Visitor/Visitor.h"
#include "PointerDefinitions.h" #include "PointerDefinitions.h"
enum class PostProcessingVariable{ enum class PostProcessingVariable{
// HowTo add new PostProcessingVariable: Add enum here, LAST has to stay last // HowTo add new PostProcessingVariable: Add enum here, LAST has to stay last
// In interpQuantities add computation of quantity in switch statement // In interpQuantities add computation of quantity in switch statement
...@@ -57,7 +58,8 @@ public: ...@@ -57,7 +58,8 @@ public:
void visit(Parameter* para, CudaMemoryManager* cudaManager, int level, uint t); void visit(Parameter* para, CudaMemoryManager* cudaManager, int level, uint t);
void free(Parameter* para, CudaMemoryManager* cudaManager); void free(Parameter* para, CudaMemoryManager* cudaManager);
ProbeStruct* getProbeStruct(int level){ return this->probeParams[level]; }
void addPostProcessingVariable(PostProcessingVariable _variable); void addPostProcessingVariable(PostProcessingVariable _variable);
private: private:
...@@ -71,8 +73,6 @@ private: ...@@ -71,8 +73,6 @@ private:
int level); int level);
virtual void calculateQuantities(ProbeStruct* probeStruct, Parameter* para, int level) = 0; virtual void calculateQuantities(ProbeStruct* probeStruct, Parameter* para, int level) = 0;
ProbeStruct* getProbeStruct(int level){ return this->probeParams[level]; }
void write(Parameter* para, int level, int t); void write(Parameter* para, int level, int t);
void writeCollectionFile(Parameter* para, int t); void writeCollectionFile(Parameter* para, int t);
void writeGridFiles(Parameter* para, int level, std::vector<std::string >& fnames, int t); void writeGridFiles(Parameter* para, int level, std::vector<std::string >& fnames, int t);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment