From 41fc5333028a04dcce6dc5a8566daebed3f3e151 Mon Sep 17 00:00:00 2001
From: iwia06 <christoph.pflaum@fau.de>
Date: Sat, 12 Dec 2020 23:04:07 +0100
Subject: [PATCH] Bug raus von interpolation
---
program/source/interpol/interpol.cc | 6 +++---
program/source/interpol/interpol.h | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/program/source/interpol/interpol.cc b/program/source/interpol/interpol.cc
index db21a5d..6e51ba9 100644
--- a/program/source/interpol/interpol.cc
+++ b/program/source/interpol/interpol.cc
@@ -740,7 +740,7 @@ if(boxWSD.z < 0 && boxENT.z > 0.0 && boxWSD.y < 0.5 && boxENT.y > 0.5 && boxWSD.
}
#pragma omp critical
- if(stop==false && typ_tet[ind_global] != 6) {
+ if(stop==false) { // && typ_tet[ind_global] != 6) { // Phillip: das darf man so nicht machen!
ids_hex[ind_global] = id_hex;
ids_i[ind_global] = i;
ids_j[ind_global] = j;
@@ -1108,9 +1108,9 @@ Interpolate_on_block_grid::Interpolate_on_block_grid(int nx_, int ny_, int nz_,
hz = (pENT.z - pWSD.z) / (nz-1);
- /*
- // test GGGG
+ /*
+ // test
cout << "\n WSD: " ; pWSD.Print();
cout << "\n ENT: " ; pENT.Print();
cout << "nx: " << nx << " ny: " << ny << " nz: " << nz << endl;
diff --git a/program/source/interpol/interpol.h b/program/source/interpol/interpol.h
index 266c683..fc20d04 100644
--- a/program/source/interpol/interpol.h
+++ b/program/source/interpol/interpol.h
@@ -194,6 +194,7 @@ void Interpolate_on_structured_grid::interpolate(Variable<DTyp>& u, DTyp* data,
<< endl;
*/
+
if(typ==0) data[ind_global] = interpolate_in_tet(lambda[ind_global],
du.WND(),du.WNT(),du.WST(),du.EST());
if(typ==1) data[ind_global] = interpolate_in_tet(lambda[ind_global],
--
GitLab