Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Phillip Lino Rall
UGBlocks_V3
Commits
1fd6fd9b
Commit
1fd6fd9b
authored
Sep 17, 2020
by
Phillip Lino Rall
Browse files
Merge branch 'master' of i10git.cs.fau.de:er96apow/UGBlocks_V3
parents
8953fc87
98e1aa33
Changes
4
Hide whitespace changes
Inline
Side-by-side
program/source/grid/blockgrid.cc
View file @
1fd6fd9b
...
@@ -290,6 +290,7 @@ Blockgrid::~Blockgrid()
...
@@ -290,6 +290,7 @@ Blockgrid::~Blockgrid()
if
(
number_points
!=
NULL
)
if
(
number_points
!=
NULL
)
delete
[]
number_points
;
delete
[]
number_points
;
number_points
=
NULL
;
number_points
=
NULL
;
if
(
bg_coord
!=
NULL
)
if
(
bg_coord
!=
NULL
)
delete
bg_coord
;
delete
bg_coord
;
}
}
...
@@ -476,7 +477,7 @@ D3vector Blockgrid::Give_coord_hexahedron ( int id_hex,
...
@@ -476,7 +477,7 @@ D3vector Blockgrid::Give_coord_hexahedron ( int id_hex,
int
i
,
int
j
,
int
k
)
const
int
i
,
int
j
,
int
k
)
const
{
{
if
(
bg_coord
!=
NULL
&&
bg_coord
->
blockgrid_edge_coordinates_calculated
)
if
(
bg_coord
!=
NULL
)
if
(
bg_coord
->
blockgrid_edge_coordinates_calculated
)
{
{
int
Nx
=
Give_Nx_hexahedron
(
id_hex
)
+
1
;
int
Nx
=
Give_Nx_hexahedron
(
id_hex
)
+
1
;
int
Ny
=
Give_Ny_hexahedron
(
id_hex
)
+
1
;
int
Ny
=
Give_Ny_hexahedron
(
id_hex
)
+
1
;
...
@@ -837,7 +838,7 @@ D3vector Blockgrid::Give_coord_quadrangle ( int id, int i, int j ) const
...
@@ -837,7 +838,7 @@ D3vector Blockgrid::Give_coord_quadrangle ( int id, int i, int j ) const
D3vector
Blockgrid
::
Give_coord_edge
(
int
id
,
int
i
)
const
D3vector
Blockgrid
::
Give_coord_edge
(
int
id
,
int
i
)
const
{
{
if
(
bg_coord
!=
NULL
&&
bg_coord
->
blockgrid_edge_coordinates_calculated
)
if
(
bg_coord
!=
NULL
)
if
(
bg_coord
->
blockgrid_edge_coordinates_calculated
)
{
{
return
bg_coord
->
blockgrid_edge_coordinates
.
at
(
id
).
at
(
i
)
;
return
bg_coord
->
blockgrid_edge_coordinates
.
at
(
id
).
at
(
i
)
;
...
...
program/source/pde_op/mgop.cc
View file @
1fd6fd9b
...
@@ -360,7 +360,6 @@ Multigrid_operator::Multigrid_operator(Blockgrid& coarse_grid_,
...
@@ -360,7 +360,6 @@ Multigrid_operator::Multigrid_operator(Blockgrid& coarse_grid_,
Multigrid_operator
::~
Multigrid_operator
()
{
Multigrid_operator
::~
Multigrid_operator
()
{
Unstructured_grid
*
ug
=
coarse_grid
->
Give_unstructured_grid
();
Unstructured_grid
*
ug
=
coarse_grid
->
Give_unstructured_grid
();
if
(
coarse
!=
NULL
)
if
(
coarse
!=
NULL
)
...
...
program2D/source/extemp/variableFFT.cc
View file @
1fd6fd9b
...
@@ -56,6 +56,10 @@ void VariableFFT::operator=(VariableFFT& v) {
...
@@ -56,6 +56,10 @@ void VariableFFT::operator=(VariableFFT& v) {
static_cast
<
Variable2D
<
std
::
complex
<
double
>
>*
>
(
this
)
->
operator
=
(
*
pv
);
static_cast
<
Variable2D
<
std
::
complex
<
double
>
>*
>
(
this
)
->
operator
=
(
*
pv
);
}
}
void
VariableFFT
::
operator
=
(
std
::
complex
<
double
>
x
)
{
static_cast
<
Variable2D
<
std
::
complex
<
double
>
>*
>
(
this
)
->
operator
=
(
x
);
}
void
VariableFFT
::
interpolate
(
Variable2D
<
std
::
complex
<
double
>
>&
v
,
void
VariableFFT
::
interpolate
(
Variable2D
<
std
::
complex
<
double
>
>&
v
,
std
::
complex
<
double
>
defaultInterpolation
)
{
std
::
complex
<
double
>
defaultInterpolation
)
{
bool
createInterpolator
=
(
assignmentBlockgrid
==
NULL
);
bool
createInterpolator
=
(
assignmentBlockgrid
==
NULL
);
...
...
program2D/source/extemp/variableFFT.h
View file @
1fd6fd9b
...
@@ -60,15 +60,30 @@ public:
...
@@ -60,15 +60,30 @@ public:
}
}
void
operator
=
(
VariableFFT
&
v
);
void
operator
=
(
VariableFFT
&
v
);
void
operator
=
(
std
::
complex
<
double
>
x
);
void
interpolate
(
Variable2D
<
std
::
complex
<
double
>
>&
v
,
void
interpolate
(
Variable2D
<
std
::
complex
<
double
>
>&
v
,
std
::
complex
<
double
>
defaultInterpolation
);
std
::
complex
<
double
>
defaultInterpolation
);
double
getHx
()
const
{
return
Hx
;
}
double
getHx
()
const
{
return
Hx
;
}
double
getHy
()
const
{
return
Hy
;
}
double
getHy
()
const
{
return
Hy
;
}
double
getNx
()
const
{
return
Nx
;
}
double
getNx
()
const
{
return
Nx
;
}
double
getNy
()
const
{
return
Ny
;
}
double
getNy
()
const
{
return
Ny
;
}
double
getSizeX
()
const
{
return
Hx
*
Nx
;
}
double
getSizeX
()
const
{
return
Hx
*
Nx
;
}
double
getSizeY
()
const
{
return
Hy
*
Ny
;
}
double
getSizeY
()
const
{
return
Hy
*
Ny
;
}
/*
double getHx() const { return getSizeX() / Nx; }
double getHy() const { return getSizeY() / Ny; }
double getNx() const { return Nx; }
double getNy() const { return Ny; }
double getSizeX() const { return assignmentBlockgrid->MaximumStrechedX() - assignmentBlockgrid->MinimumStrechedX(); }
double getSizeY() const { return assignmentBlockgrid->MaximumStrechedY() - assignmentBlockgrid->MinimumStrechedY(); }
*/
//
//
private:
private:
void
init
();
void
init
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment