From c57785876603d7b26f28021748c4eaa05f65ff08 Mon Sep 17 00:00:00 2001
From: Phillip Lino Rall <phillip.lino.rall@fau.de>
Date: Wed, 2 Sep 2020 13:41:22 +0200
Subject: [PATCH] =?UTF-8?q?default=20destructor=20f=C3=BCr=20mg=5Farray=20?=
=?UTF-8?q?ist=20jetzt=20:=20assert(false)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
program/source/extemp/variable.h | 12 ------------
program/source/grid/blockgrid.cc | 4 ++--
program/source/math_lib/mg_array.h | 3 +++
3 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/program/source/extemp/variable.h b/program/source/extemp/variable.h
index a41b7ca..d49ccbb 100644
--- a/program/source/extemp/variable.h
+++ b/program/source/extemp/variable.h
@@ -514,18 +514,6 @@ inline double Variable<double>::Give_data<hexahedronEl> ( params_in ) const {
template <>
template <>
inline void Variable<double>::Set_data<hexahedronEl> ( params_in, double value ) {
- if (id == 4 && i == 8 && j == 8 && k == 8)
- {
- std::cout << "broh " << std::endl;
- }
- else if (id == 5 && i == 0 && j == 0 && k == 8)
- {
- std::cout << "broh " << std::endl;
- }
- else if (id == 8 && i == 0 && j == 8 && k == 8)
- {
- std::cout << "broh " << std::endl;
- }
data_hexahedra[id][i+ ( Nx+1 ) * ( j+ ( Ny+1 ) *k ) ] = value;
}
diff --git a/program/source/grid/blockgrid.cc b/program/source/grid/blockgrid.cc
index b2fa009..b464c28 100644
--- a/program/source/grid/blockgrid.cc
+++ b/program/source/grid/blockgrid.cc
@@ -1088,7 +1088,7 @@ void Blockgrid_coordinates::init_blockgrid_coordinates_boundary()
//if ((i > 0 || i < Nx-1) ^ (j > 0 || j < Ny-1) ^ (k > 0 || k < Nz-1))
//remove true here?
- if (true || (i == 0 || i == Nx-1) || (j== 0 || j == Ny-1) || (k == 0 || k == Nz-1))
+ if (false || (i == 0 || i == Nx-1) || (j== 0 || j == Ny-1) || (k == 0 || k == Nz-1))
{
//inner loop
for (int id_hexInner = 0 ; id_hexInner < bg->Give_unstructured_grid()->Give_number_hexahedra() ; id_hexInner++)
@@ -1108,7 +1108,7 @@ void Blockgrid_coordinates::init_blockgrid_coordinates_boundary()
{
// not sure which if loop is correct:
//if ((iInner > 0 || iInner < NxInner-1) ^ (jInner > 0 || jInner < NyInner-1) ^ (kInner > 0 || kInner < NzInner-1))
- if (true || (iInner == 0 || iInner == NxInner-1) || (jInner == 0 || jInner == NyInner-1) || (kInner == 0 || kInner == NzInner-1))
+ if (false || (iInner == 0 || iInner == NxInner-1) || (jInner == 0 || jInner == NyInner-1) || (kInner == 0 || kInner == NzInner-1))
{
if(D3VectorNormSquared(bg->Give_coord_hexahedron(id_hex,i,j,k) - bg->Give_coord_hexahedron(id_hexInner,iInner,jInner,kInner)) < 1e-10 )
{
diff --git a/program/source/math_lib/mg_array.h b/program/source/math_lib/mg_array.h
index 7fb575b..7f9f877 100644
--- a/program/source/math_lib/mg_array.h
+++ b/program/source/math_lib/mg_array.h
@@ -32,6 +32,9 @@ template <class T>
class MG_array {
public:
MG_array(int l);
+ MG_array(const MG_array org) { assert(false); }
+ MG_array(MG_array org) { assert(false); }
+
~MG_array();
Set_MG_array<T> operator() (int i);
T& operator[] (int i);
--
GitLab