Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Phillip Lino Rall
UGBlocks_V3
Commits
eecec385
Commit
eecec385
authored
Jan 13, 2021
by
Christoph Pflaum
Browse files
Minimum am Rand bei interpol.cc
parent
0c5cf539
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
12 deletions
+31
-12
program/source/interpol/interpol.cc
program/source/interpol/interpol.cc
+31
-12
No files found.
program/source/interpol/interpol.cc
View file @
eecec385
...
...
@@ -140,17 +140,19 @@ void Interpolate_on_structured_grid::update_Interpolate_on_structured_grid(Block
D3vector
lam
;
blockgrid
=
&
blockgrid_
;
ug
=
blockgrid
->
Give_unstructured_grid
();
//Variable<double> coordXYZ(*blockgrid);
X_coordinate
Xc
(
blockgrid_
);
Y_coordinate
Yc
(
blockgrid_
);
Z_coordinate
Zc
(
blockgrid_
);
//D3vector pWSD, pENT;
pWSD
.
x
=
Minimum
(
Xc
);
pWSD
.
y
=
Minimum
(
Yc
);
pWSD
.
z
=
Minimum
(
Zc
);
pENT
.
x
=
Maximum
(
Xc
);
pENT
.
y
=
Maximum
(
Yc
);
pENT
.
z
=
Maximum
(
Zc
);
Boundary_Marker
boundary
(
ug
);
pWSD
.
x
=
Minimum
(
Xc
,
boundary
);
pWSD
.
y
=
Minimum
(
Yc
,
boundary
);
pWSD
.
z
=
Minimum
(
Zc
,
boundary
);
pENT
.
x
=
Maximum
(
Xc
,
boundary
);
pENT
.
y
=
Maximum
(
Yc
,
boundary
);
pENT
.
z
=
Maximum
(
Zc
,
boundary
);
blockgrid
=
&
blockgrid_
;
ug
=
blockgrid
->
Give_unstructured_grid
();
...
...
@@ -835,11 +837,17 @@ Interpolate_on_structured_grid::Interpolate_on_structured_grid(int nx_, int ny_,
Y_coordinate
Yc
(
blockgrid_
);
Z_coordinate
Zc
(
blockgrid_
);
//D3vector pWSD, pENT;
pWSD
.
x
=
Minimum
(
Xc
);
pWSD
.
y
=
Minimum
(
Yc
);
pWSD
.
z
=
Minimum
(
Zc
);
pENT
.
x
=
Maximum
(
Xc
);
pENT
.
y
=
Maximum
(
Yc
);
pENT
.
z
=
Maximum
(
Zc
);
//
pWSD.x = Minimum(Xc); pWSD.y = Minimum(Yc); pWSD.z = Minimum(Zc);
//
pENT.x = Maximum(Xc); pENT.y = Maximum(Yc); pENT.z = Maximum(Zc);
blockgrid
=
&
blockgrid_
;
ug
=
blockgrid
->
Give_unstructured_grid
();
Boundary_Marker
boundary
(
ug
);
pWSD
.
x
=
Minimum
(
Xc
,
boundary
);
pWSD
.
y
=
Minimum
(
Yc
,
boundary
);
pWSD
.
z
=
Minimum
(
Zc
,
boundary
);
pENT
.
x
=
Maximum
(
Xc
,
boundary
);
pENT
.
y
=
Maximum
(
Yc
,
boundary
);
pENT
.
z
=
Maximum
(
Zc
,
boundary
);
nx
=
nx_
;
ny
=
ny_
;
...
...
@@ -936,9 +944,15 @@ Interpolate_on_block_grid::Interpolate_on_block_grid(int nx_, int ny_, int nz_,
Y_coordinate
Yc
(
*
blockgrid_to
);
Z_coordinate
Zc
(
*
blockgrid_to
);
pWSD
.
x
=
Minimum
(
Xc
);
pWSD
.
y
=
Minimum
(
Yc
);
pWSD
.
z
=
Minimum
(
Zc
);
pENT
.
x
=
Maximum
(
Xc
);
pENT
.
y
=
Maximum
(
Yc
);
pENT
.
z
=
Maximum
(
Zc
);
//pWSD.x = Minimum(Xc); pWSD.y = Minimum(Yc); pWSD.z = Minimum(Zc);
//pENT.x = Maximum(Xc); pENT.y = Maximum(Yc); pENT.z = Maximum(Zc);
Boundary_Marker
boundary
(
blockgrid_to
->
Give_unstructured_grid
());
pWSD
.
x
=
Minimum
(
Xc
,
boundary
);
pWSD
.
y
=
Minimum
(
Yc
,
boundary
);
pWSD
.
z
=
Minimum
(
Zc
,
boundary
);
pENT
.
x
=
Maximum
(
Xc
,
boundary
);
pENT
.
y
=
Maximum
(
Yc
,
boundary
);
pENT
.
z
=
Maximum
(
Zc
,
boundary
);
interpolatorStructured
=
new
Interpolate_on_structured_grid
(
nx
,
ny
,
nz
,
pWSD
,
pENT
,
*
blockgrid_from
);
data
=
new
double
[
nx
*
ny
*
nz
];
...
...
@@ -1064,8 +1078,13 @@ PointInterpolator::PointInterpolator(int nx_, int ny_, int nz_,
X_coordinate
Xc
(
*
blockgrid_from
);
Y_coordinate
Yc
(
*
blockgrid_from
);
Z_coordinate
Zc
(
*
blockgrid_from
);
pWSD
.
x
=
Minimum
(
Xc
);
pWSD
.
y
=
Minimum
(
Yc
);
pWSD
.
z
=
Minimum
(
Zc
);
pENT
.
x
=
Maximum
(
Xc
);
pENT
.
y
=
Maximum
(
Yc
);
pENT
.
z
=
Maximum
(
Zc
);
//pWSD.x = Minimum(Xc); pWSD.y = Minimum(Yc); pWSD.z = Minimum(Zc);
//pENT.x = Maximum(Xc); pENT.y = Maximum(Yc); pENT.z = Maximum(Zc);
Boundary_Marker
boundary
(
blockgrid_from
->
Give_unstructured_grid
());
pWSD
.
x
=
Minimum
(
Xc
,
boundary
);
pWSD
.
y
=
Minimum
(
Yc
,
boundary
);
pWSD
.
z
=
Minimum
(
Zc
,
boundary
);
pENT
.
x
=
Maximum
(
Xc
,
boundary
);
pENT
.
y
=
Maximum
(
Yc
,
boundary
);
pENT
.
z
=
Maximum
(
Zc
,
boundary
);
interpolatorStructured
=
new
Interpolate_on_structured_grid
(
nx
,
ny
,
nz
,
pWSD
,
pENT
,
*
blockgrid_from
,
trilinearInterpolation_
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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