Commit 5ff01c82 authored by Phillip Lino Rall's avatar Phillip Lino Rall
Browse files

cutted lens now working. direct_interpolator compatible with cutted lens

parent 772912ba
......@@ -101,7 +101,7 @@ Blockgrid::Blockgrid ( Unstructured_grid *ug_, int Nx, int Ny, int Nz ) {
Blockgrid::Blockgrid ( Unstructured_grid *ug_, int Nx, int Ny, int Nz, int Nr ) {
// cout << "Nx " << Nx << "Ny " << Ny << "Nz " << Nz << "Nr " << Nr << endl;
cout << "Nx " << Nx << "Ny " << Ny << "Nz " << Nz << "Nr " << Nr << endl;
id_of_grid = id_count_grid; ++id_count_grid;
phase_shift = NULL;
bg_coord = NULL;
......@@ -121,6 +121,28 @@ Blockgrid::Blockgrid ( Unstructured_grid *ug_, int Nx, int Ny, int Nz, int Nr )
variable_set = false;
}
Blockgrid::Blockgrid(Unstructured_grid *ug_, int Nx, int Ny, int Nz, int Nr, int Nr2){
cout << "Nx " << Nx << "Ny " << Ny << "Nz " << Nz << "Nr " << Nr << endl;
id_of_grid = id_count_grid; ++id_count_grid;
phase_shift = NULL;
bg_coord = NULL;
ug = ug_;
if ( ug->degree_of_freedom() !=5 ) {
cout << " error in Blockgrid::Blockgrid(Unstructured_grid *ug_,int Nx,int Ny,int Nz,int Nr) "
<< endl;
cout << " number of degree of freedom is: " << ug->degree_of_freedom() << endl;
}
number_points = new int[5];
number_points[0] = Nx;
number_points[1] = Ny;
number_points[2] = Nz;
number_points[3] = Nr;
number_points[4] = Nr2;
variable_set = false;
}
Blockgrid::Blockgrid ( Unstructured_grid *ug_, int Nx, int Ny, std::vector<int>& Nz ) {
id_of_grid = id_count_grid; ++id_count_grid;
phase_shift = NULL;
......
......@@ -71,6 +71,7 @@ class Blockgrid {
Blockgrid(Unstructured_grid *ug, int N);
Blockgrid(Unstructured_grid *ug, int Nx, int Ny, int Nz);
Blockgrid(Unstructured_grid *ug, int Nx, int Ny, int Nz, int Nr);
Blockgrid(Unstructured_grid *ug, int Nx, int Ny, int Nz, int Nr, int Nr2);
Blockgrid(Unstructured_grid *ug_, int Nx, int Ny, std::vector<int>& Nz);
Blockgrid(Unstructured_grid *ug_, std::vector<int>& Nx, std::vector<int>& Ny, std::vector<int>& Nz);
Blockgrid(Unstructured_grid *ug_, std::vector<int> Nvec);
......
This diff is collapsed.
......@@ -45,7 +45,7 @@ class Lens_Geometry_Quad : public Unstructured_grid {
class Lens_Geometry_cutted_edges : public Unstructured_grid {
public:
//Lens_Geometry_cutted_edges(double Radius, double thickness, double curvatureLeft, double curvatureRight, double distForCutLeft, double distForCutRight, double edgeThickness, double offsetX, double offsetY, double offsetZ, bool inner_grid_arched = false, double radius = 0.0);
Lens_Geometry_cutted_edges(double Radius, double thickness, double curvatureLeft, double curvatureRight, double offsetX, double offsetY, double offsetZ, bool inner_grid_arched = false, double radius = 0.0, double cut_edge_from_left = 0, double cut_edge_from_right = 0);
Lens_Geometry_cutted_edges(double RadiusLeft, double RadiusRight, double MechanicalRadiusLeft,double MechanicalRadiusRight, double thickness, double curvatureLeft, double curvatureRight, double offsetX, double offsetY, double offsetZ, bool inner_grid_arched = false, double radius = 0.0);
~Lens_Geometry_cutted_edges(){};
double getThickness(){return thickness_;};
......
......@@ -230,6 +230,9 @@ void Unstructured_grid::Set_hexahedron(int id,
hexahedra[id].Set_id_corner(WNTdir3D,i_WNT);
hexahedra[id].Set_id_corner(ENTdir3D,i_ENT);
std::cout << "id " << id << " " << i_WSD << " " << i_ESD << " " << i_WND << " " << i_END << " "
<< i_WST << " " << i_EST << " " << i_WNT << " " << i_ENT<< std::endl;
hexahedra[id].Set_coord(WSDdir3D,points[i_WSD].Give_coordinate());
hexahedra[id].Set_coord(ESDdir3D,points[i_ESD].Give_coordinate());
......@@ -254,6 +257,7 @@ void Unstructured_grid::Set_hexahedron(int id,
if(construction_hexahedron_points_done_yn==true)
cout << " error in Unstructured_grid::Set_hexahedron !" << endl;
hexahedra[id].Set_id_corner(WSDdir3D,i_WSD);
hexahedra[id].Set_id_corner(ESDdir3D,i_ESD);
hexahedra[id].Set_id_corner(WNDdir3D,i_WND);
......@@ -263,6 +267,7 @@ void Unstructured_grid::Set_hexahedron(int id,
hexahedra[id].Set_id_corner(WNTdir3D,i_WNT);
hexahedra[id].Set_id_corner(ENTdir3D,i_ENT);
hexahedra[id].Set_coord(WSDdir3D,coord_WSD);
hexahedra[id].Set_coord(ESDdir3D,coord_ESD);
hexahedra[id].Set_coord(WNDdir3D,coord_WND);
......
......@@ -1529,7 +1529,7 @@ void Interpolate_direct::init()
}
else
{
correctRelation.at(5) = calculateNeighbourIndexRelation(indexAllFacesInside.at(5), indexAllFacesOutside.at(5));
correctRelation.at(5) = calculateNeighbourIndexRelation(indexAllFacesInside.at(5), indexAllFacesOutside.at(5));
}
......
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