[cig-commits] [commit] rajesh-petsc: commented out p_to_nodes_petsc, v_from_vector_petsc, v_from_vector_pseudo_surf_petsc, solve_constrained_flow_iterative_petsc (4bfc600)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Aug 20 12:37:12 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc
Link : https://github.com/geodynamics/citcoms/compare/fb1839e7e93bc56eb542afd64b3db70f2df6a5d8...15e05e4d8d088429e89c42427a1392f428737625
>---------------------------------------------------------------
commit 4bfc600b0851aad9165cd2e4816359fa02a9eebc
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Aug 20 12:29:51 2014 -0700
commented out p_to_nodes_petsc, v_from_vector_petsc, v_from_vector_pseudo_surf_petsc, solve_constrained_flow_iterative_petsc
>---------------------------------------------------------------
4bfc600b0851aad9165cd2e4816359fa02a9eebc
bin/Citcom.c | 1 +
lib/Nodal_mesh.c | 8 ++++----
lib/Petsc_citcoms.c | 3 +++
lib/Stokes_flow_Incomp.c | 4 ++--
lib/prototypes.h | 8 ++++----
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/bin/Citcom.c b/bin/Citcom.c
index d64e88a..b136d67 100644
--- a/bin/Citcom.c
+++ b/bin/Citcom.c
@@ -103,6 +103,7 @@ int main(argc,argv)
read_instructions(E, argv[1]);
/* create mesh, setup solvers etc. */
+ /* also initialize E->UVec, E->PVec, E->FVec, E->K, E->G, E->D */
initial_setup(E);
cpu_time_on_vp_it = CPU_time0();
diff --git a/lib/Nodal_mesh.c b/lib/Nodal_mesh.c
index e168d0b..3269c3b 100644
--- a/lib/Nodal_mesh.c
+++ b/lib/Nodal_mesh.c
@@ -58,7 +58,7 @@ void v_from_vector(E)
return;
}
-
+/*
PetscErrorCode v_from_vector_petsc(struct All_variables *E)
{
PetscFunctionReturn(0);
@@ -68,7 +68,7 @@ PetscErrorCode v_from_vector_pseudo_surf_petsc(struct All_variables *E)
{
PetscFunctionReturn(0);
}
-
+*/
void assign_v_to_vector(E)
struct All_variables *E;
{
@@ -210,7 +210,7 @@ void velo_from_element_d(E,VV,m,el,sphere_key)
}
return;
}
-
+/*
PetscErrorCode p_to_nodes_petsc(struct All_variables *E,
Vec PVec, Vec PNVec, int lev )
{
@@ -242,7 +242,7 @@ PetscErrorCode p_to_nodes_petsc(struct All_variables *E,
PetscFunctionReturn(0);
}
-
+*/
void p_to_nodes(E,P,PN,lev)
struct All_variables *E;
double **P;
diff --git a/lib/Petsc_citcoms.c b/lib/Petsc_citcoms.c
index 8ad1e2f..42b205d 100644
--- a/lib/Petsc_citcoms.c
+++ b/lib/Petsc_citcoms.c
@@ -118,6 +118,8 @@ PetscErrorCode assemble_c_u_PETSc( struct All_variables *E,
}
ierr = VecRestoreArray( U, &U_temp ); CHKERRQ( ierr );
ierr = VecRestoreArray( result, &result_temp ); CHKERRQ( ierr );
+
+ PetscFunctionReturn(0);
}
void strip_bcs_from_residual_PETSc(
@@ -171,6 +173,7 @@ PetscErrorCode initial_vel_residual_PETSc( struct All_variables *E,
/* V = V + u1 */
ierr = VecAXPY( V, 1.0, u1 ); CHKERRQ( ierr );
+ PetscFunctionReturn(0);
}
PetscErrorCode PC_Apply_MultiGrid( PC pc, Vec x, Vec y )
diff --git a/lib/Stokes_flow_Incomp.c b/lib/Stokes_flow_Incomp.c
index 86656b3..de15ee3 100644
--- a/lib/Stokes_flow_Incomp.c
+++ b/lib/Stokes_flow_Incomp.c
@@ -85,7 +85,7 @@ void solve_constrained_flow_iterative(E)
return;
}
-
+/*
PetscErrorCode solve_constrained_flow_iterative_petsc(struct All_variables *E)
{
PetscErrorCode ierr;
@@ -105,7 +105,7 @@ PetscErrorCode solve_constrained_flow_iterative_petsc(struct All_variables *E)
PetscFunctionReturn(0);
}
-
+*/
/* ========================================================================= */
static double momentum_eqn_residual(struct All_variables *E,
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 0ff02f5..c7aeaec 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -263,15 +263,15 @@ void get_prem(double, double *, double *, double *);
void compute_seismic_model(struct All_variables *, double *, double *, double *);
/* Nodal_mesh.c */
void v_from_vector(struct All_variables *);
-PetscErrorCode v_from_vector_petsc(struct All_variables *);
+//PetscErrorCode v_from_vector_petsc(struct All_variables *);
void assign_v_to_vector(struct All_variables *);
void v_from_vector_pseudo_surf(struct All_variables *);
-PetscErrorCode v_from_vector_pseudo_surf_petsc(struct All_variables *);
+//PetscErrorCode v_from_vector_pseudo_surf_petsc(struct All_variables *);
void velo_from_element(struct All_variables *, float [4][9], int, int, int);
void velo_from_element_d(struct All_variables *, double [4][9], int, int, int);
void p_to_nodes(struct All_variables *, double **, float **, int);
-PetscErrorCode p_to_nodes_petsc(struct All_variables *, Vec, Vec, int);
+//PetscErrorCode p_to_nodes_petsc(struct All_variables *, Vec, Vec, int);
void visc_from_gint_to_nodes(struct All_variables *, float **, float **, int);
void visc_from_nodes_to_gint(struct All_variables *, float **, float **, int);
@@ -492,7 +492,7 @@ void get_angle_sphere_cap(double [4][5], double [6]);
double get_angle(double [4], double [4]);
/* Stokes_flow_Incomp.c */
void solve_constrained_flow_iterative(struct All_variables *);
-PetscErrorCode solve_constrained_flow_iterative_petsc(struct All_variables *);
+//PetscErrorCode solve_constrained_flow_iterative_petsc(struct All_variables *);
/* Topo_gravity.c */
void get_STD_topo(struct All_variables *, float **, float **, float **, float **, int);
void get_STD_freesurf(struct All_variables *, float **);
More information about the CIG-COMMITS
mailing list