Commit f1c07123 authored by Christoph Pflaum's avatar Christoph Pflaum
Browse files

ikleine Änderung

parent 5affe25d
...@@ -250,16 +250,16 @@ void Variable<DTyp>::interpolateSlizeZ(const Expr2D<A>& a_, IteratorZDirection* ...@@ -250,16 +250,16 @@ void Variable<DTyp>::interpolateSlizeZ(const Expr2D<A>& a_, IteratorZDirection*
assert(numberCorners2D==4); assert(numberCorners2D==4);
int Nx = blockgrid2D->Give_Nx_rectangle(0); int Nx = blockgrid2D->Give_Nx_rectangle(0);
int Ny = blockgrid2D->Give_Ny_rectangle(0); int Ny = blockgrid2D->Give_Ny_rectangle(0);
a.Update<rectangleEl>(0); a.template Update<rectangleEl>(0);
int k = iterZ->get_k_intern(); int k = iterZ->get_k_intern();
int id = iterZ->get_nummerBlock(); int id = iterZ->get_nummerBlock();
Update<hexahedronEl>(id); Update<hexahedronEl>(id);
a.Update<rectangleEl>(0); a.template Update<rectangleEl>(0);
for(int j = 0;j <= Ny;++j) for(int j = 0;j <= Ny;++j)
for(int i = 0;i <= Nx;++i) { for(int i = 0;i <= Nx;++i) {
data_hexahedra[id][(i)+(Nx+1)*((j)+(Ny+1)*(k))] = a.Give_data<rectangleEl>(0, i, j, Nx); data_hexahedra[id][(i)+(Nx+1)*((j)+(Ny+1)*(k))] = a.template Give_data<rectangleEl>(0, i, j, Nx);
} }
Update_back(id); Update_back(id);
} }
...@@ -276,10 +276,10 @@ void Variable<DTyp>::interpolateSlizeZ(const Expr2D<A>& a_, IteratorZDirection* ...@@ -276,10 +276,10 @@ void Variable<DTyp>::interpolateSlizeZ(const Expr2D<A>& a_, IteratorZDirection*
int id = id_rec*num_blocks + id_block; int id = id_rec*num_blocks + id_block;
Update<hexahedronEl>(id); Update<hexahedronEl>(id);
a.Update<rectangleEl>(id_rec); a.template Update<rectangleEl>(id_rec);
for(int j = 0;j <= Ny;++j) for(int j = 0;j <= Ny;++j)
for(int i = 0;i <= Nx;++i) { for(int i = 0;i <= Nx;++i) {
data_hexahedra[id][(i)+(Nx+1)*((j)+(Ny+1)*(k))] = a.Give_data<rectangleEl>(id_rec, i, j, Nx); data_hexahedra[id][(i)+(Nx+1)*((j)+(Ny+1)*(k))] = a.template Give_data<rectangleEl>(id_rec, i, j, Nx);
} }
Update_back(id); Update_back(id);
} }
...@@ -300,10 +300,10 @@ void Variable<DTyp>::interpolateSlizeZ(const Expr2D<A>& a_, IteratorZDirection* ...@@ -300,10 +300,10 @@ void Variable<DTyp>::interpolateSlizeZ(const Expr2D<A>& a_, IteratorZDirection*
int id = id_rec*num_blocks + id_block; int id = id_rec*num_blocks + id_block;
Update<hexahedronEl>(id); Update<hexahedronEl>(id);
a.Update<rectangleEl>(id_rec); a.template Update<rectangleEl>(id_rec);
for(int j = 0;j <= Ny;++j) for(int j = 0;j <= Ny;++j)
for(int i = 0;i <= Nx;++i) { for(int i = 0;i <= Nx;++i) {
data_hexahedra[id][(i)+(Nx+1)*((j)+(Ny+1)*(k))] = a.Give_data<rectangleEl>(id_rec, i, j, Nx); data_hexahedra[id][(i)+(Nx+1)*((j)+(Ny+1)*(k))] = a.template Give_data<rectangleEl>(id_rec, i, j, Nx);
} }
Update_back(id); Update_back(id);
} }
...@@ -324,10 +324,10 @@ void Variable<DTyp>::interpolateSlizeZ(const Expr2D<A>& a_, IteratorZDirection* ...@@ -324,10 +324,10 @@ void Variable<DTyp>::interpolateSlizeZ(const Expr2D<A>& a_, IteratorZDirection*
int id = id_rec*num_blocks + id_block; int id = id_rec*num_blocks + id_block;
Update<hexahedronEl>(id); Update<hexahedronEl>(id);
a.Update<rectangleEl>(id_rec); a.template Update<rectangleEl>(id_rec);
for(int j = 0;j <= Ny;++j) for(int j = 0;j <= Ny;++j)
for(int i = 0;i <= Nx;++i) { for(int i = 0;i <= Nx;++i) {
data_hexahedra[id][(i)+(Nx+1)*((j)+(Ny+1)*(k))] = a.Give_data<rectangleEl>(id_rec, i, j, Nx); data_hexahedra[id][(i)+(Nx+1)*((j)+(Ny+1)*(k))] = a.template Give_data<rectangleEl>(id_rec, i, j, Nx);
} }
Update_back(id); Update_back(id);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment