[cig-commits] [commit] rajesh-petsc-schur: corrected the signatures of normalize_director_at_gnodes and normalize_director_at_gint (322f2b8)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Sep 25 15:08:42 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/c4c1cf8c9c00db42db37ba9de24475c42f027909...ec0945705eef4b24081ed7ef0f52224d56e1b34c
>---------------------------------------------------------------
commit 322f2b874d2ed979ad50cfd281b6b4b0cbd82918
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Thu Sep 25 14:09:29 2014 -0700
corrected the signatures of normalize_director_at_gnodes and normalize_director_at_gint
>---------------------------------------------------------------
322f2b874d2ed979ad50cfd281b6b4b0cbd82918
lib/Anisotropic_viscosity.c | 8 ++++----
lib/anisotropic_viscosity.h | 6 ------
lib/prototypes.h | 4 ++--
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/lib/Anisotropic_viscosity.c b/lib/Anisotropic_viscosity.c
index dded4f7..def40bf 100644
--- a/lib/Anisotropic_viscosity.c
+++ b/lib/Anisotropic_viscosity.c
@@ -499,14 +499,14 @@ void set_anisotropic_viscosity_at_element_level(struct All_variables *E,
}
}
-void normalize_director_at_nodes(struct All_variables *E,float **n1,float **n2, float **n3, int lev)
+void normalize_director_at_nodes(struct All_variables *E,float *n1,float *n2, float *n3, int lev)
{
int n,m;
for(n=1;n<=E->lmesh.NNO[lev];n++){
- normalize_vec3(&(n1[CPPR][n]),&(n2[CPPR][n]),&(n3[CPPR][n]));
+ normalize_vec3(&(n1[n]),&(n2[n]),&(n3[n]));
}
}
-void normalize_director_at_gint(struct All_variables *E,float **n1,float **n2, float **n3, int lev)
+void normalize_director_at_gint(struct All_variables *E,float *n1,float *n2, float *n3, int lev)
{
int m,e,i,enode;
const int nsd=E->mesh.nsd;
@@ -514,7 +514,7 @@ void normalize_director_at_gint(struct All_variables *E,float **n1,float **n2, f
for(e=1;e<=E->lmesh.NEL[lev];e++)
for(i=1;i<=vpts;i++) {
enode = (e-1)*vpts+i;
- normalize_vec3(&(n1[CPPR][enode]),&(n2[CPPR][enode]),&( n3[CPPR][enode]));
+ normalize_vec3(&(n1[enode]),&(n2[enode]),&( n3[enode]));
}
}
/*
diff --git a/lib/anisotropic_viscosity.h b/lib/anisotropic_viscosity.h
index 3fc5819..890f9a0 100644
--- a/lib/anisotropic_viscosity.h
+++ b/lib/anisotropic_viscosity.h
@@ -62,14 +62,8 @@ void get_vgm_p(double [4][9],struct Shape_function *,
int ,int , int , int ,
double [3][3], double [3]);
-#ifdef CitcomS_global_defs_h /* CitcomS */
-void normalize_director_at_nodes(struct All_variables *, float **, float **, float **, int);
-void normalize_director_at_gint(struct All_variables *, float **, float **, float **, int);
-#else
void normalize_director_at_nodes(struct All_variables *, float *, float *, float *, int);
void normalize_director_at_gint(struct All_variables *, float *, float *, float *, int);
-#endif
-
#define __CITCOM_READ_ANIVISC_HEADER__
#endif
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 0346238..bb00d44 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -18,8 +18,8 @@ void get_constitutive_ti_viscosity(double [6][6], double, double, double [3], in
void get_constitutive_orthotropic_viscosity(double [6][6], double, double [3], int, double, double);
void get_constitutive_isotropic(double [6][6]);
void set_anisotropic_viscosity_at_element_level(struct All_variables *, int);
-void normalize_director_at_nodes(struct All_variables *, float **, float **, float **, int);
-void normalize_director_at_gint(struct All_variables *, float **, float **, float **, int);
+void normalize_director_at_nodes(struct All_variables *, float *, float *, float *, int);
+void normalize_director_at_gint(struct All_variables *, float *, float *, float *, int);
void conv_cart4x4_to_spherical(double [3][3][3][3], double, double, double [3][3][3][3]);
void conv_cart6x6_to_spherical(double [6][6], double, double, double [6][6]);
void rotate_ti6x6_to_director(double [6][6], double [3]);
More information about the CIG-COMMITS
mailing list