From f332b837d4027ccda5fb48b2658e3323a40283af Mon Sep 17 00:00:00 2001
From: Cristian C Lalescu <Cristian.Lalescu@ds.mpg.de>
Date: Fri, 18 Dec 2015 10:56:46 +0100
Subject: [PATCH] go back to using big spectra
---
bfps/cpp/fluid_solver_base.cpp | 13 ++-----------
bfps/fluid_base.py | 6 +++---
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/bfps/cpp/fluid_solver_base.cpp b/bfps/cpp/fluid_solver_base.cpp
index 717eb773..482f8d4d 100644
--- a/bfps/cpp/fluid_solver_base.cpp
+++ b/bfps/cpp/fluid_solver_base.cpp
@@ -298,17 +298,8 @@ fluid_solver_base<R>::fluid_solver_base( \
if (this->kM < this->kMy) this->kM = this->kMy; \
if (this->kM < this->kMz) this->kM = this->kMz; \
this->kM2 = this->kM * this->kM; \
- switch(this->dealias_type) \
- { \
- case 1: \
- this->kMspec = 4*this->kM/5; \
- this->kMspec2 = this->kMspec*this->kMspec; \
- break; \
- default: \
- this->kMspec = this->kM; \
- this->kMspec2 = this->kM2; \
- break; \
- } \
+ this->kMspec = this->kM; \
+ this->kMspec2 = this->kM2; \
this->dk = this->dkx; \
if (this->dk > this->dky) this->dk = this->dky; \
if (this->dk > this->dkz) this->dk = this->dkz; \
diff --git a/bfps/fluid_base.py b/bfps/fluid_base.py
index facddc7e..62dfcfd2 100644
--- a/bfps/fluid_base.py
+++ b/bfps/fluid_base.py
@@ -361,9 +361,9 @@ class fluid_particle_base(bfps.code):
def get_kspace(self):
kspace = {}
if self.parameters['dealias_type'] == 1:
- kMx = self.parameters['dkx']*(4*(self.parameters['nx']//2 - 1)//5)
- kMy = self.parameters['dky']*(4*(self.parameters['ny']//2 - 1)//5)
- kMz = self.parameters['dkz']*(4*(self.parameters['nz']//2 - 1)//5)
+ kMx = self.parameters['dkx']*(self.parameters['nx']//2 - 1)
+ kMy = self.parameters['dky']*(self.parameters['ny']//2 - 1)
+ kMz = self.parameters['dkz']*(self.parameters['nz']//2 - 1)
else:
kMx = self.parameters['dkx']*(self.parameters['nx']//3 - 1)
kMy = self.parameters['dky']*(self.parameters['ny']//3 - 1)
--
GitLab