This is an automated email from the git hooks/post-receive script.
logari81 pushed a commit to branch master
in repository getfem.
The following commit(s) were added to refs/heads/master by this push:
new 98f393a0 Whitespace and typos
98f393a0 is described below
commit 98f393a0e635ac66ccb81ff7db0543b64cc13b0e
Author: Konstantinos Poulios
AuthorDate: Sun Apr 28 10:33:41 2024 +0200
Whitespace and typos
---
contrib/xfem_contact/xfem_dirichlet.cc | 761 -
src/getfem/getfem_mesh_region.h| 4 +-
src/gmm/gmm_MUMPS_interface.h | 32 +-
3 files changed, 396 insertions(+), 401 deletions(-)
diff --git a/contrib/xfem_contact/xfem_dirichlet.cc
b/contrib/xfem_contact/xfem_dirichlet.cc
index dc792d51..740d4fdc 100644
--- a/contrib/xfem_contact/xfem_dirichlet.cc
+++ b/contrib/xfem_contact/xfem_dirichlet.cc
@@ -73,8 +73,8 @@ typedef getfem::modeling_standard_plain_vector plain_vector;
typedef gmm::row_matrix sparse_row_matrix;
-/*
- * Exact solution
+/*
+ * Exact solution
*/
double Radius;
int u_version;
@@ -89,7 +89,7 @@ double u_exact(const base_node ) {
switch (u_version) {
case 0: {
double sum = std::accumulate(p.begin(), p.end(), double(0));
-
+
return 5.0 * sin(sum) * (r*r - Radius*Radius);
}
case 1: {
@@ -98,11 +98,11 @@ double u_exact(const base_node ) {
}
case 2: {
double A=u_alpha, n=u_n, B=u_B;
-return (R*R - r*r *(1+A*(1.0 + sin(n*T * cos(B*r);
+return (R*R - r*r *(1+A*(1.0 + sin(n*T * cos(B*r);
}
case 3: {
double A=u_alpha, n=u_n;
-return 5*(R*R*R*R - r*r*r*r*(1+A*(1.0 + sin(n*T;
+return 5*(R*R*R*R - r*r*r*r*(1+A*(1.0 + sin(n*T;
}
case 4:{
return 5.0 * (r*r*r - Radius*Radius*Radius);
@@ -114,17 +114,17 @@ double u_exact(const base_node ) {
}
case 6:{
double sum = std::accumulate(p.begin(), p.end(), double(0));
-
+
return 5.0 * sin(sum) * (r*r*r - Radius*Radius*Radius);
}
case 7:{
double sum = std::accumulate(p.begin(), p.end(), double(0));
-
+
return 5.0 * sin(sum) * (r*r*r*r - Radius*Radius*Radius*Radius);
}
case 8:{
-double rho=gmm::sqrt(p[0]*p[0]+ p[1]*p[1]+ p[2]*p[2]);
-
+double rho=gmm::sqrt(p[0]*p[0]+ p[1]*p[1]+ p[2]*p[2]);
+
return 5.0 * ( Radius*Radius* Radius-rho*rho*rho);
}
}
@@ -140,33 +140,33 @@ double g_exact(const base_node ) {
double sum=std::accumulate(p.begin(), p.end(), double(0)), norm_sqr = r*r;
if (norm_sqr < 1e-10) norm_sqr = 1e-10;
return 5.0 * (sum * cos(sum) * (norm_sqr - R*R)
- + 2.0 * norm_sqr * sin(sum)) / sqrt(norm_sqr);
+ + 2.0 * norm_sqr * sin(sum)) / sqrt(norm_sqr);
}
case 1: {
double A=u_alpha, T=atan2(p[1], p[0])+dtheta, n=u_n;
return -
sqrt(r*r*pow(2.0*sin(T)+2.0*sin(T)*A+2.0*sin(T)*A*sin(n*T)+cos(T)*A*cos(n*T)*n,2.0)+r*r*pow(-2.0*cos(T)-2.0*cos(T)*A-2.0*cos(T)*A*sin(n*T)+sin(T)*A*cos(n*T)*n,2.0));
- }
+ }
case 2: {
double A=u_alpha, T=atan2(p[1], p[0])+dtheta, n=u_n,B=u_B;
if (gmm::abs(r) < 1e-10) r = 1e-10;
return -(4.0*r*cos(B*r)+8.0*r*cos(B*r)*A+8.0*r*cos(B*r)*A*A
-+2.0*sin(B*r)*B*R*R-2.0*sin(B*r)*B*r*r
-+r*A*A*pow(cos(n*T),2.0)*n*n*cos(B*r)+8.0*r*cos(B*r)*A*A*sin(n*T)
--4.0*sin(B*r)*B*r*r*A*sin(n*T)
-+2.0*sin(B*r)*B*r*r*A*A*pow(cos(n*T),2.0)
--4.0*r*cos(B*r)*A*A*pow(cos(n*T),2.0)+8.0*r*cos(B*r)*A*sin(n*T)
--4.0*sin(B*r)*B*r*r*A*A*sin(n*T)-4.0*sin(B*r)*B*r*r*A*A
--4.0*sin(B*r)*B*r*r*A+2.0*sin(B*r)*B*R*R*A
-+2.0*sin(B*r)*B*R*R*A*sin(n*T))
+ +2.0*sin(B*r)*B*R*R-2.0*sin(B*r)*B*r*r
+ +r*A*A*pow(cos(n*T),2.0)*n*n*cos(B*r)+8.0*r*cos(B*r)*A*A*sin(n*T)
+ -4.0*sin(B*r)*B*r*r*A*sin(n*T)
+ +2.0*sin(B*r)*B*r*r*A*A*pow(cos(n*T),2.0)
+ -4.0*r*cos(B*r)*A*A*pow(cos(n*T),2.0)+8.0*r*cos(B*r)*A*sin(n*T)
+ -4.0*sin(B*r)*B*r*r*A*A*sin(n*T)-4.0*sin(B*r)*B*r*r*A*A
+ -4.0*sin(B*r)*B*r*r*A+2.0*sin(B*r)*B*R*R*A
+ +2.0*sin(B*r)*B*R*R*A*sin(n*T))
/ sqrt(A*A*pow(cos(n*T),2.0)*n*n +4.0+8.0*A+8.0*A*sin(n*T)
-+8.0*A*A+8.0*A*A*sin(n*T)-4.0*A*A*pow(cos(n*T),2.0));
+ +8.0*A*A+8.0*A*A*sin(n*T)-4.0*A*A*pow(cos(n*T),2.0));
}
case 3: {
double A=u_alpha, T=atan2(p[1], p[0])+dtheta, n=u_n;
return -5*r*r*r*sqrt(16.0 + 32.0*A*A + 32.0*A*sin(n*T) + 32.0*A
-+ 32.0*A*A*sin(n*T) - 16*gmm::sqr(A*cos(n*T))
-+ gmm::sqr(A*cos(n*T)*n));
- }
+ + 32.0*A*A*sin(n*T) - 16*gmm::sqr(A*cos(n*T))
+ + gmm::sqr(A*cos(n*T)*n));
+ }
case 4: {
r=gmm::vect_norm2(p);
return 15*r*r;
@@ -175,20 +175,20 @@ double g_exact(const base_node ) {
double a = sol5_a, b = sol5_b;
double T = atan2(p[1], p[0]);
return 5.0*r*sqrt(