Commit 757eaef9 authored by Phillip Lino Rall's avatar Phillip Lino Rall
Browse files

Prepared class Lens_geometry, can add cutted edges in the future

parent 6de835e4
......@@ -882,14 +882,14 @@ Lens_Geometry::Lens_Geometry (double Radius, double thickness, double curvatureL
construction_done();
}
Lens_Geometry_Quad::Lens_Geometry_Quad(double Radius, double thickness, double curvatureLeft, double curvatureRight, double offsetX, double offsetY, double offsetZ, bool inner_grid_arched, double radius)
Lens_Geometry_Quad::Lens_Geometry_Quad(double Radius, double thickness, double curvatureLeft, double curvatureRight, double offsetX, double offsetY, double offsetZ, bool inner_grid_arched, double radius, double cut_edge_from_left, double cut_edge_from_right)
{
if (radius == 0)
{
radius = Radius / 2.0;
}
assert(Radius > radius);
size_pointer_global_data = 10;
size_pointer_global_data = 12;
if (fabs(curvatureLeft) >1e10)
{
curvatureLeft = 1e10;
......@@ -965,11 +965,11 @@ Lens_Geometry_Quad::Lens_Geometry_Quad(double Radius, double thickness, double c
}
if (curvatureRight < 0 && curvatureLeft < 0)
{
assert (((fabs(z_right_outer - z_left_outer) - thickness) < 0.0) && "Lens has negative thickness at edge! Make lens more thick or increase radius of curvature.");
// if (curvatureRight < 0 && curvatureLeft < 0)
// {
// assert (((fabs(z_right_outer - z_left_outer) - thickness) < 0.0) && "Lens has negative thickness at edge! Make lens more thick or increase radius of curvature.");
}
// }
if (curvatureRight > 0 && curvatureLeft > 0)
{
assert ((((z_right_outer - z_left_outer) ) > 0.0) && "Lens has negative thickness at edge! Make lens more thick or increase radius of curvature.");
......@@ -981,6 +981,8 @@ Lens_Geometry_Quad::Lens_Geometry_Quad(double Radius, double thickness, double c
pointer_global_data[7] = z_left_outer;
pointer_global_data[8] = z_right_inner;
pointer_global_data[9] = z_right_outer;
pointer_global_data[10] = cut_edge_from_left;
pointer_global_data[11] = cut_edge_from_right;
// cout << "fixed lens param., channge again " << endl;
......
......@@ -21,7 +21,7 @@ class Lens_Geometry : public Unstructured_grid {
class Lens_Geometry_Quad : public Unstructured_grid {
public:
Lens_Geometry_Quad(double Radius, double thickness, double curvatureLeft, double curvatureRight, double offsetX, double offsetY, double offsetZ, bool inner_grid_arched = false, double radius = 0.0);
Lens_Geometry_Quad(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_Quad(){};
double Radius;
......@@ -31,6 +31,18 @@ class Lens_Geometry_Quad : public Unstructured_grid {
private:
};
class Lens_Geometry_cutted_edges : public Unstructured_grid {
public:
Lens_Geometry_cutted_edges(double Radius, double thickness, double curvatureLeft, double curvatureRight, double radiusForCutLeft, double radiusForCutRight, double edgeThickness, double offsetX, double offsetY, double offsetZ, bool inner_grid_arched = false, double radius = 0.0);
~Lens_Geometry_cutted_edges(){};
double Radius;
double radius;
double length;
private:
};
......
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