From 9f4edcbefa4ddf6ef520d7aeb3f7401f0861543f Mon Sep 17 00:00:00 2001
From: Chichi Lalescu <chichilalescu@gmail.com>
Date: Mon, 8 May 2017 15:34:01 +0200
Subject: [PATCH] child of NSVE compiles
---
bfps/cpp/full_code/NSVEparticles.cpp | 16 ++++++++--------
bfps/cpp/full_code/NSVEparticles.hpp | 4 ++--
setup.py | 1 +
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/bfps/cpp/full_code/NSVEparticles.cpp b/bfps/cpp/full_code/NSVEparticles.cpp
index 08b50226..9c0603b1 100644
--- a/bfps/cpp/full_code/NSVEparticles.cpp
+++ b/bfps/cpp/full_code/NSVEparticles.cpp
@@ -10,17 +10,17 @@ int NSVEparticles<rnumber>::initialize(void)
this->NSVE<rnumber>::initialize();
this->ps = particles_system_builder(
- fs->cvelocity, // (field object)
- fs->kk, // (kspace object, contains dkx, dky, dkz)
+ this->fs->cvelocity, // (field object)
+ this->fs->kk, // (kspace object, contains dkx, dky, dkz)
tracers0_integration_steps, // to check coherency between parameters and hdf input file (nb rhs)
(long long int)nparticles, // to check coherency between parameters and hdf input file
- fs->get_current_fname(), // particles input filename
- std::string("/tracers0/state/") + std::to_string(fs->iteration), // dataset name for initial input
- std::string("/tracers0/rhs/") + std::to_string(fs->iteration), // dataset name for initial input
+ this->fs->get_current_fname(), // particles input filename
+ std::string("/tracers0/state/") + std::to_string(this->fs->iteration), // dataset name for initial input
+ std::string("/tracers0/rhs/") + std::to_string(this->fs->iteration), // dataset name for initial input
tracers0_neighbours, // parameter (interpolation no neighbours)
tracers0_smoothness, // parameter
this->comm,
- fs->iteration+1);
+ this->fs->iteration+1);
this->particles_output_writer_mpi = new particles_output_hdf5<long long int,double,3,3>(
MPI_COMM_WORLD,
"tracers0",
@@ -32,7 +32,7 @@ int NSVEparticles<rnumber>::initialize(void)
template <typename rnumber>
int NSVEparticles<rnumber>::step(void)
{
- this->fs->compute_velocity(fs->cvorticity);
+ this->fs->compute_velocity(this->fs->cvorticity);
this->fs->cvelocity->ift();
this->ps->completeLoop(this->dt);
this->NSVE<rnumber>::step();
@@ -43,7 +43,7 @@ template <typename rnumber>
int NSVEparticles<rnumber>::write_checkpoint(void)
{
this->NSVE<rnumber>::write_checkpoint();
- this->particles_output_writer_mpi->open_file(fs->get_current_fname());
+ this->particles_output_writer_mpi->open_file(this->fs->get_current_fname());
this->particles_output_writer_mpi->save(
this->ps->getParticlesPositions(),
this->ps->getParticlesRhs(),
diff --git a/bfps/cpp/full_code/NSVEparticles.hpp b/bfps/cpp/full_code/NSVEparticles.hpp
index 298d9950..f912da64 100644
--- a/bfps/cpp/full_code/NSVEparticles.hpp
+++ b/bfps/cpp/full_code/NSVEparticles.hpp
@@ -37,7 +37,7 @@
#include "particles/particles_output_hdf5.hpp"
template <typename rnumber>
-class NSVEparticles: public NSVE
+class NSVEparticles: public NSVE<rnumber>
{
public:
@@ -56,7 +56,7 @@ class NSVEparticles: public NSVE
NSVEparticles(
const MPI_Comm COMMUNICATOR,
const std::string &simulation_name):
- NSVE(
+ NSVE<rnumber>(
COMMUNICATOR,
simulation_name){}
~NSVEparticles(){}
diff --git a/setup.py b/setup.py
index dd2f4b6d..ba0c230e 100644
--- a/setup.py
+++ b/setup.py
@@ -90,6 +90,7 @@ print('This is bfps version ' + VERSION)
### lists of files and MANIFEST.in
src_file_list = ['full_code/direct_numerical_simulation',
'full_code/NSVE',
+ 'full_code/NSVEparticles',
'full_code/NSVEp',
'vorticity_equation',
'field',
--
GitLab