[cig-commits] [commit] rajesh-petsc, rajesh-petsc-schur: started working on the v_from_vector_petsc, v_from_vector_pseudo_surf_petsc, p_to_nodes_petsc implementations (b8f1712)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Nov 5 19:02:23 PST 2014


Repository : https://github.com/geodynamics/citcoms

On branches: rajesh-petsc,rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

>---------------------------------------------------------------

commit b8f1712de5fc3d33f1bead7ec6aa4641db70fd34
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Aug 20 12:28:46 2014 -0700

    started working on the v_from_vector_petsc, v_from_vector_pseudo_surf_petsc, p_to_nodes_petsc implementations


>---------------------------------------------------------------

b8f1712de5fc3d33f1bead7ec6aa4641db70fd34
 lib/Nodal_mesh.c         | 15 +++++++++++++++
 lib/Stokes_flow_Incomp.c |  2 --
 lib/prototypes.h         |  5 +++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/Nodal_mesh.c b/lib/Nodal_mesh.c
index a1496f1..7ad63c7 100644
--- a/lib/Nodal_mesh.c
+++ b/lib/Nodal_mesh.c
@@ -59,6 +59,16 @@ void v_from_vector(E)
     return;
 }
 
+PetscErrorCode v_from_vector_petsc(struct All_variables *E)
+{
+  PetscFunctionReturn(0);
+}
+
+PetscErrorCode v_from_vector_pseudo_surf_petsc(struct All_variables *E)
+{
+  PetscFunctionReturn(0);
+}
+
 void assign_v_to_vector(E)
      struct All_variables *E;
 {
@@ -201,6 +211,11 @@ 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 )
+{
+  PetscFunctionReturn(0);
+}
 
 void p_to_nodes(E,P,PN,lev)
      struct All_variables *E;
diff --git a/lib/Stokes_flow_Incomp.c b/lib/Stokes_flow_Incomp.c
index 433943c..86656b3 100644
--- a/lib/Stokes_flow_Incomp.c
+++ b/lib/Stokes_flow_Incomp.c
@@ -96,14 +96,12 @@ PetscErrorCode solve_constrained_flow_iterative_petsc(struct All_variables *E)
       E->control.accuracy, &cycles);
   CHKERRQ(ierr);
 
-  /*
   if(E->control.pseudo_free_surf)
     v_from_vector_pseudo_surf_petsc(E);
   else
     v_from_vector_petsc(E);
 
   p_to_nodes_petsc(E, E->PVec, E->NPVec, E->mesh.levmax);
-  */
   
   PetscFunctionReturn(0);
 }
diff --git a/lib/prototypes.h b/lib/prototypes.h
index d874efc..0ff02f5 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -263,11 +263,16 @@ 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 *);
 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 *);
 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);
+
 void visc_from_gint_to_nodes(struct All_variables *, float **, float **, int);
 void visc_from_nodes_to_gint(struct All_variables *, float **, float **, int);
 void visc_from_gint_to_ele(struct All_variables *, float **, float **, int);



More information about the CIG-COMMITS mailing list