[cig-commits] [commit] rajesh-petsc-schur: Corrected the signature of vnorm_nonnewt (f2a74ac)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Nov 5 19:10:45 PST 2014


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

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

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

commit f2a74acd864e006e007079adf75bd060a188d388
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Fri Sep 19 10:05:25 2014 -0700

    Corrected the signature of vnorm_nonnewt


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

f2a74acd864e006e007079adf75bd060a188d388
 lib/Global_operations.c | 10 +++++-----
 lib/prototypes.h        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Global_operations.c b/lib/Global_operations.c
index 8e69976..fbd5154 100644
--- a/lib/Global_operations.c
+++ b/lib/Global_operations.c
@@ -740,7 +740,7 @@ float Tmax(E,T)
 
 double  vnorm_nonnewt(E,dU,U,lev)
   struct All_variables *E;
-  double **dU,**U;
+  double *dU,*U;
   int lev;
 {
  double temp1,temp2,dtemp,temp;
@@ -756,10 +756,10 @@ double  vnorm_nonnewt(E,dU,U,lev)
      for (i=1;i<=dims;i++)
        for (a=1;a<=ends;a++) {
 	 node = E->IEN[lev][CPPR][e].node[a];
-         dtemp += dU[CPPR][ E->ID[lev][CPPR][node].doff[i] ]*
-                  dU[CPPR][ E->ID[lev][CPPR][node].doff[i] ];
-         temp += U[CPPR][ E->ID[lev][CPPR][node].doff[i] ]*
-                 U[CPPR][ E->ID[lev][CPPR][node].doff[i] ];
+         dtemp += dU[ E->ID[lev][CPPR][node].doff[i] ]*
+                  dU[ E->ID[lev][CPPR][node].doff[i] ];
+         temp += U[ E->ID[lev][CPPR][node].doff[i] ]*
+                 U[ E->ID[lev][CPPR][node].doff[i] ];
          }
 
 
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 6329a22..3e22fa4 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -214,7 +214,7 @@ double global_dmax(struct All_variables *, double);
 float global_fmax(struct All_variables *, double);
 double Tmaxd(struct All_variables *, double **);
 float Tmax(struct All_variables *, float **);
-double vnorm_nonnewt(struct All_variables *, double **, double **, int);
+double vnorm_nonnewt(struct All_variables *, double *, double *, int);
 void sum_across_depth_sph1(struct All_variables *, float *, float *);
 void broadcast_vertical(struct All_variables *, float *, float *, int);
 void remove_rigid_rot(struct All_variables *);



More information about the CIG-COMMITS mailing list