Skip to content

Opravy #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
l-korous wants to merge 1 commit into
base: ln-elast-dist
Choose a base branch
from
Open

Opravy #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion 2d-advanced/elasticity-linear/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
add_subdirectory(bracket)
add_subdirectory(crack)
add_subdirectory(crack)
add_subdirectory(distortion)
10 changes: 5 additions & 5 deletions 2d-advanced/elasticity-linear/distortion/definitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,7 @@ MeshFunction<double>* ExactSolutionTrEo::clone() const
}

// Custom filter S11
void CustomFilterS11::filter_fn(int n, double* x, double* y, Hermes::vector<double*> values, Hermes::vector<double*> dx, Hermes::vector<double*> dy,
void CustomFilterS11::filter_fn(int n, double* x, double* y, Hermes::vector<const double*> values, Hermes::vector<const double*> dx, Hermes::vector<const double*> dy,
double* out, double* outdx, double* outdy)
{
for (int i = 0; i < n; i++)
Expand All @@ -686,7 +686,7 @@ void CustomFilterS11::filter_fn(int n, double* x, double* y, Hermes::vector<doub
}

// Custom filter S12
void CustomFilterS12::filter_fn(int n, double* x, double* y, Hermes::vector<double*> values, Hermes::vector<double*> dx, Hermes::vector<double*> dy,
void CustomFilterS12::filter_fn(int n, double* x, double* y, Hermes::vector<const double*> values, Hermes::vector<const double*> dx, Hermes::vector<const double*> dy,
double* out, double* outdx, double* outdy)
{
for (int i = 0; i < n; i++)
Expand All @@ -698,7 +698,7 @@ void CustomFilterS12::filter_fn(int n, double* x, double* y, Hermes::vector<doub
}

// Custom filter S22
void CustomFilterS22::filter_fn(int n, double* x, double* y, Hermes::vector<double*> values, Hermes::vector<double*> dx, Hermes::vector<double*> dy,
void CustomFilterS22::filter_fn(int n, double* x, double* y, Hermes::vector<const double*> values, Hermes::vector<const double*> dx, Hermes::vector<const double*> dy,
double* out, double* outdx, double* outdy)
{
for (int i = 0; i < n; i++)
Expand All @@ -710,7 +710,7 @@ void CustomFilterS22::filter_fn(int n, double* x, double* y, Hermes::vector<doub
}

// Custom filter S33
void CustomFilterS33::filter_fn(int n, double* x, double* y, Hermes::vector<double*> values, Hermes::vector<double*> dx, Hermes::vector<double*> dy,
void CustomFilterS33::filter_fn(int n, double* x, double* y, Hermes::vector<const double*> values, Hermes::vector<const double*> dx, Hermes::vector<const double*> dy,
double* out, double* outdx, double* outdy)
{
for (int i = 0; i < n; i++)
Expand All @@ -722,7 +722,7 @@ void CustomFilterS33::filter_fn(int n, double* x, double* y, Hermes::vector<doub
}

// Custom filter von Mises (with distortions)
void CustomFilter_vM::filter_fn(int n, double* x, double* y, Hermes::vector<double*> values, Hermes::vector<double*> dx, Hermes::vector<double*> dy,
void CustomFilter_vM::filter_fn(int n, double* x, double* y, Hermes::vector<const double*> values, Hermes::vector<const double*> dx, Hermes::vector<const double*> dy,
double* out, double* outdx, double* outdy)
{
for (int i = 0; i < n; i++)
Expand Down
10 changes: 5 additions & 5 deletions 2d-advanced/elasticity-linear/distortion/definitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ virtual MeshFunction<double>* clone() const
return filter;
}
private:
virtual void filter_fn(int n, double* x, double* y, Hermes::vector<double *> values, Hermes::vector<double *> dx, Hermes::vector<double *> dy, double* rslt, double* rslt_dx, double* rslt_dy);
virtual void filter_fn(int n, double* x, double* y, Hermes::vector<const double *> values, Hermes::vector<const double *> dx, Hermes::vector<const double *> dy, double* rslt, double* rslt_dx, double* rslt_dy);
double mu, lambda;
CustomEo11* Eo11d;
CustomEo12* Eo12d;
Expand All @@ -485,7 +485,7 @@ virtual MeshFunction<double>* clone() const
return filter;
}
private:
virtual void filter_fn(int n, double* x, double* y, Hermes::vector<double *> values, Hermes::vector<double *> dx, Hermes::vector<double *> dy, double* rslt, double* rslt_dx, double* rslt_dy);
virtual void filter_fn(int n, double* x, double* y, Hermes::vector<const double *> values, Hermes::vector<const double *> dx, Hermes::vector<const double *> dy, double* rslt, double* rslt_dx, double* rslt_dy);
double mu, lambda;
CustomEo11* Eo11d;
CustomEo12* Eo12d;
Expand All @@ -511,7 +511,7 @@ virtual MeshFunction<double>* clone() const
return filter;
}
private:
virtual void filter_fn(int n, double* x, double* y, Hermes::vector<double *> values, Hermes::vector<double *> dx, Hermes::vector<double *> dy, double* rslt, double* rslt_dx, double* rslt_dy);
virtual void filter_fn(int n, double* x, double* y, Hermes::vector<const double *> values, Hermes::vector<const double *> dx, Hermes::vector<const double *> dy, double* rslt, double* rslt_dx, double* rslt_dy);
double mu, lambda;
CustomEo11* Eo11d;
CustomEo12* Eo12d;
Expand All @@ -537,7 +537,7 @@ virtual MeshFunction<double>* clone() const
return filter;
}
private:
virtual void filter_fn(int n, double* x, double* y, Hermes::vector<double *> values, Hermes::vector<double *> dx, Hermes::vector<double *> dy, double* rslt, double* rslt_dx, double* rslt_dy);
virtual void filter_fn(int n, double* x, double* y, Hermes::vector<const double *> values, Hermes::vector<const double *> dx, Hermes::vector<const double *> dy, double* rslt, double* rslt_dx, double* rslt_dy);
double mu, lambda;
CustomEo11* Eo11d;
CustomEo12* Eo12d;
Expand All @@ -563,7 +563,7 @@ virtual MeshFunction<double>* clone() const
return filter;
}
private:
virtual void filter_fn(int n, double* x, double* y, Hermes::vector<double *> values, Hermes::vector<double *> dx, Hermes::vector<double *> dy, double* rslt, double* rslt_dx, double* rslt_dy);
virtual void filter_fn(int n, double* x, double* y, Hermes::vector<const double *> values, Hermes::vector<const double *> dx, Hermes::vector<const double *> dy, double* rslt, double* rslt_dx, double* rslt_dy);
double mu, lambda;
CustomEo11* Eo11d;
CustomEo12* Eo12d;
Expand Down
19 changes: 9 additions & 10 deletions 2d-advanced/elasticity-linear/distortion/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@ int main(int argc, char* argv[])
// Construct globally refined reference mesh and setup reference space.
Mesh::ReferenceMeshCreator ref_mesh_creator(mesh);
MeshSharedPtr ref_mesh = ref_mesh_creator.create_ref_mesh();
Space<double>::ReferenceSpaceCreator u_ref_space_creator(u_space, ref_mesh);
Space<double>::ReferenceSpaceCreator u_ref_space_creator(u_space, ref_mesh, 0);
SpaceSharedPtr<double> u_ref_space = u_ref_space_creator.create_ref_space();
Space<double>::ReferenceSpaceCreator v_ref_space_creator(v_space, ref_mesh);
Space<double>::ReferenceSpaceCreator v_ref_space_creator(v_space, ref_mesh, 0);
SpaceSharedPtr<double> v_ref_space = v_ref_space_creator.create_ref_space();
Space<double>::ReferenceSpaceCreator p_ref_space_creator(p_space, ref_mesh);
Space<double>::ReferenceSpaceCreator p_ref_space_creator(p_space, ref_mesh, 0);
SpaceSharedPtr<double> p_ref_space = p_ref_space_creator.create_ref_space();
/*
MeshView mvu("Mesh u", new WinGeom(0, 0, 580, 400));
Expand Down Expand Up @@ -275,8 +275,7 @@ int main(int argc, char* argv[])
// Increase counter.
as++;
}
while (as<2); // ! ! ! attention this is to control the number of iterations to be replaced by the line bottom
// while (done == false);
while (done == false);

Hermes::Mixins::Loggable::Static::info("Total running time: %g s", cpu_time.accumulated());

Expand Down Expand Up @@ -308,11 +307,11 @@ int main(int argc, char* argv[])
viewU.show(u_sln);
viewV.show(v_sln);
viewP.show(p_sln);
viewS11.show(S11, HERMES_EPS_HIGH, H2D_FN_VAL_0, u_sln, v_sln, 1.0);
viewS12.show(S12, HERMES_EPS_HIGH, H2D_FN_VAL_0, u_sln, v_sln, 1.0);
viewS22.show(S22, HERMES_EPS_HIGH, H2D_FN_VAL_0, u_sln, v_sln, 1.0);
viewS33.show(S33, HERMES_EPS_HIGH, H2D_FN_VAL_0, u_sln, v_sln, 1.0);
view_vM.show(vM, HERMES_EPS_HIGH, H2D_FN_VAL_0, u_sln, v_sln, 1.0);
viewS11.show(S11, H2D_FN_VAL_0, u_sln, v_sln, 1.0);
viewS12.show(S12, H2D_FN_VAL_0, u_sln, v_sln, 1.0);
viewS22.show(S22, H2D_FN_VAL_0, u_sln, v_sln, 1.0);
viewS33.show(S33, H2D_FN_VAL_0, u_sln, v_sln, 1.0);
view_vM.show(vM, H2D_FN_VAL_0, u_sln, v_sln, 1.0);
}

// Wait for the view to be closed.
Expand Down