[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 9th argument of horizontal_bc, which was set to the caps_per_proc loop variable (9bcbb7b)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Nov 5 19:09:57 PST 2014


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

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

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

commit 9bcbb7bf563904ee62fed02869b361d77d769f9e
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 12:51:38 2014 -0700

    Eliminated the 9th argument of horizontal_bc, which was set to the caps_per_proc loop variable


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

9bcbb7bf563904ee62fed02869b361d77d769f9e
 lib/BC_util.c                      |  2 +-
 lib/Full_boundary_conditions.c     | 87 ++++++++++++++++----------------------
 lib/Regional_boundary_conditions.c | 80 +++++++++++++++++------------------
 3 files changed, 77 insertions(+), 92 deletions(-)

diff --git a/lib/BC_util.c b/lib/BC_util.c
index 126ca84..2743dba 100644
--- a/lib/BC_util.c
+++ b/lib/BC_util.c
@@ -27,7 +27,7 @@
  */
 
 #include "global_defs.h"
-void horizontal_bc(struct All_variables *,float *[],int,int,float,unsigned int,char,int,int);
+void horizontal_bc(struct All_variables *,float *[],int,int,float,unsigned int,char,int);
 void internal_horizontal_bc(struct All_variables *,float *[],int,int,float,unsigned int,char,int,int);
 void myerror(struct All_variables *,char *);
 int layers(struct All_variables *,int);
diff --git a/lib/Full_boundary_conditions.c b/lib/Full_boundary_conditions.c
index ad97238..d5b3a8e 100644
--- a/lib/Full_boundary_conditions.c
+++ b/lib/Full_boundary_conditions.c
@@ -35,7 +35,7 @@
 #endif
 /* ========================================== */
 
-static void horizontal_bc(struct All_variables *,float *[],int,int,float,unsigned int,char,int,int);
+static void horizontal_bc(struct All_variables *,float *[],int,int,float,unsigned int,char,int);
 void assign_internal_bc(struct All_variables * );
 static void velocity_apply_periodic_bcs();
 static void temperature_apply_periodic_bcs();
@@ -57,12 +57,12 @@ void full_velocity_boundary_conditions(E)
   for(lv=E->mesh.gridmax;lv>=E->mesh.gridmin;lv--) {
       noz = E->mesh.NOZ[lv];
       if(E->mesh.topvbc != 1) {	/* free slip top */
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,0.0,VBX,0,lv,CPPR);
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,VBZ,1,lv,CPPR);
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,0.0,VBY,0,lv,CPPR);
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,E->control.VBXtopval,SBX,1,lv,CPPR);
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,SBZ,0,lv,CPPR);
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,E->control.VBYtopval,SBY,1,lv,CPPR);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,0.0,VBX,0,lv);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,VBZ,1,lv);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,0.0,VBY,0,lv);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,E->control.VBXtopval,SBX,1,lv);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,SBZ,0,lv);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,E->control.VBYtopval,SBY,1,lv);
 #ifdef USE_GGRD
 	/* Ggrd traction control */
 	if((lv==E->mesh.gridmax) && E->control.ggrd.vtop_control)
@@ -71,21 +71,21 @@ void full_velocity_boundary_conditions(E)
 
       }
       if(E->mesh.botvbc != 1) {	/* free slip bottom */
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,0.0,VBX,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,VBZ,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,0.0,VBY,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,E->control.VBXbotval,SBX,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,SBZ,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,E->control.VBYbotval,SBY,1,lv,CPPR);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,0.0,VBX,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,VBZ,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,0.0,VBY,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,E->control.VBXbotval,SBX,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,SBZ,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,E->control.VBYbotval,SBY,1,lv);
         }
 
       if(E->mesh.topvbc == 1) {	/* velocity/no slip BC */
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,E->control.VBXtopval,VBX,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,VBZ,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,E->control.VBYtopval,VBY,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,0.0,SBX,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,SBZ,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,0.0,SBY,0,lv,CPPR);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,E->control.VBXtopval,VBX,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,VBZ,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,E->control.VBYtopval,VBY,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,0.0,SBX,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,SBZ,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,0.0,SBY,0,lv);
 
 #ifdef USE_GGRD
 	/* Ggrd velocity control */
@@ -107,12 +107,12 @@ void full_velocity_boundary_conditions(E)
       }
 
       if(E->mesh.botvbc == 1) {	/* velocity bottom BC */
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,E->control.VBXbotval,VBX,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,VBZ,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,E->control.VBYbotval,VBY,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,0.0,SBX,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,SBZ,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,0.0,SBY,0,lv,CPPR);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,E->control.VBXbotval,VBX,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,VBZ,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,E->control.VBYbotval,VBY,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,0.0,SBX,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,SBZ,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,0.0,SBY,0,lv);
         }
       }    /* end for j and lv */
 
@@ -150,23 +150,23 @@ void full_temperature_boundary_conditions(E)
   lev = E->mesh.levmax;
     noz = E->mesh.noz;
     if(E->mesh.toptbc == 1)    {
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,TBZ,1,lev,CPPR);
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,FBZ,0,lev,CPPR);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,TBZ,1,lev);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,FBZ,0,lev);
       if(E->control.tbcs_file)
           read_temperature_boundary_from_file(E);
       }
     else   {
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,TBZ,0,lev,CPPR);
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,FBZ,1,lev,CPPR);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,TBZ,0,lev);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,FBZ,1,lev);
       }
 
     if(E->mesh.bottbc == 1)    {
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,TBZ,1,lev,CPPR);
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,FBZ,0,lev,CPPR);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,TBZ,1,lev);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,FBZ,0,lev);
       }
     else        {
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,TBZ,0,lev,CPPR);
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,FBZ,1,lev,CPPR);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,TBZ,0,lev);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,FBZ,1,lev);
       }
 
     if(E->control.lith_age_time==1)  {
@@ -188,7 +188,7 @@ void full_temperature_boundary_conditions(E)
 /*  =========================================================  */
 
 static void horizontal_bc(struct All_variables *E,float *BC[],int ROW,int dirn,float value,
-			  unsigned int mask,char onoff,int level,int m)
+			  unsigned int mask,char onoff,int level)
 {
   int i,j,node,rowl;
 
@@ -225,8 +225,6 @@ static void horizontal_bc(struct All_variables *E,float *BC[],int ROW,int dirn,f
       }
 
     }             /* end for if ROW */
-
-  return;
 }
 
 
@@ -234,23 +232,10 @@ static void velocity_apply_periodic_bcs(E)
     struct All_variables *E;
 {
   fprintf(E->fp,"Periodic boundary conditions\n");
-
-  return;
-  }
+}
 
 static void temperature_apply_periodic_bcs(E)
     struct All_variables *E;
 {
  fprintf(E->fp,"Periodic temperature boundary conditions\n");
-
-  return;
-  }
-
-
-
-
-
-/* version */
-/* $Id$ */
-
-/* End of file  */
+}
diff --git a/lib/Regional_boundary_conditions.c b/lib/Regional_boundary_conditions.c
index e84ceaf..41fb777 100644
--- a/lib/Regional_boundary_conditions.c
+++ b/lib/Regional_boundary_conditions.c
@@ -35,7 +35,7 @@
 #endif
 
 /* ========================================== */
-static void horizontal_bc(struct All_variables *,float *[],int,int,float,unsigned int,char,int,int);
+static void horizontal_bc(struct All_variables *,float *[],int,int,float,unsigned int,char,int);
 void assign_internal_bc(struct All_variables *);
 static void velocity_apply_periodic_bcs();
 static void temperature_apply_periodic_bcs();
@@ -59,12 +59,12 @@ void regional_velocity_boundary_conditions(E)
       noz = E->lmesh.NOZ[lv];
 
       if(E->mesh.topvbc == 0) {
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,0.0,VBX,0,lv,CPPR);
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,VBZ,1,lv,CPPR);
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,0.0,VBY,0,lv,CPPR);
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,E->control.VBXtopval,SBX,1,lv,CPPR);
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,SBZ,0,lv,CPPR);
-	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,E->control.VBYtopval,SBY,1,lv,CPPR);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,0.0,VBX,0,lv);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,VBZ,1,lv);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,0.0,VBY,0,lv);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,E->control.VBXtopval,SBX,1,lv);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,SBZ,0,lv);
+	horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,E->control.VBYtopval,SBY,1,lv);
 
 #ifdef USE_GGRD
 	/* Ggrd traction control */
@@ -74,12 +74,12 @@ void regional_velocity_boundary_conditions(E)
 
       }
       else if(E->mesh.topvbc == 1) {
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,E->control.VBXtopval,VBX,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,VBZ,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,E->control.VBYtopval,VBY,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,0.0,SBX,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,SBZ,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,0.0,SBY,0,lv,CPPR);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,E->control.VBXtopval,VBX,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,VBZ,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,E->control.VBYtopval,VBY,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,0.0,SBX,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,SBZ,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,0.0,SBY,0,lv);
 #ifdef USE_GGRD
 	/* Ggrd velocity control */
 	if((lv==E->mesh.gridmax) && E->control.ggrd.vtop_control)
@@ -92,31 +92,31 @@ void regional_velocity_boundary_conditions(E)
       }
       else if(E->mesh.topvbc == 2) {
 	/* This extra BC is for a open top */
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,0.0,VBX,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,VBZ,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,0.0,VBY,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,E->control.VBXtopval,SBX,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,SBZ,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,E->control.VBYtopval,SBY,1,lv,CPPR);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,0.0,VBX,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,VBZ,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,0.0,VBY,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,1,E->control.VBXtopval,SBX,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,3,0.0,SBZ,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,noz,2,E->control.VBYtopval,SBY,1,lv);
         }
 
 
 
       if(E->mesh.botvbc == 0) {
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,0.0,VBX,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,VBZ,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,0.0,VBY,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,E->control.VBXbotval,SBX,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,SBZ,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,E->control.VBYbotval,SBY,1,lv,CPPR);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,0.0,VBX,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,VBZ,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,0.0,VBY,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,E->control.VBXbotval,SBX,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,SBZ,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,E->control.VBYbotval,SBY,1,lv);
         }
       else if(E->mesh.botvbc == 1) {
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,E->control.VBXbotval,VBX,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,VBZ,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,E->control.VBYbotval,VBY,1,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,0.0,SBX,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,SBZ,0,lv,CPPR);
-        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,0.0,SBY,0,lv,CPPR);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,E->control.VBXbotval,VBX,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,VBZ,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,E->control.VBYbotval,VBY,1,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,1,0.0,SBX,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,3,0.0,SBZ,0,lv);
+        horizontal_bc(E,E->sphere.cap[CPPR].VB,1,2,0.0,SBY,0,lv);
         }
 
 
@@ -164,24 +164,24 @@ void regional_temperature_boundary_conditions(E)
 
     noz = E->lmesh.noz;
     if(E->mesh.toptbc == 1)    {
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,TBZ,1,lev,CPPR);
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,FBZ,0,lev,CPPR);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,TBZ,1,lev);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,FBZ,0,lev);
       if(E->control.tbcs_file)   {
 	  read_temperature_boundary_from_file(E);   /* read in the temperature boundary condition from file */
 	}
       }
     else   {
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,TBZ,0,lev,CPPR);
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,FBZ,1,lev,CPPR);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,TBZ,0,lev);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,noz,3,E->control.TBCtopval,FBZ,1,lev);
       }
 
     if(E->mesh.bottbc == 1)    {
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,TBZ,1,lev,CPPR);
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,FBZ,0,lev,CPPR);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,TBZ,1,lev);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,FBZ,0,lev);
       }
     else        {
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,TBZ,0,lev,CPPR);
-      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,FBZ,1,lev,CPPR);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,TBZ,0,lev);
+      horizontal_bc(E,E->sphere.cap[CPPR].TB,1,3,E->control.TBCbotval,FBZ,1,lev);
       }
 
     if((E->control.temperature_bound_adj==1) || (E->control.lith_age_time==1))  {
@@ -385,7 +385,7 @@ static void temperature_refl_vert_bc(E)
 
 
 static void horizontal_bc( struct All_variables *E,float *BC[], int ROW,int dirn,
-			   float value,unsigned int mask,char onoff,int level,int m)
+			   float value,unsigned int mask,char onoff,int level)
 
 {
   int i,j,node,rowl;



More information about the CIG-COMMITS mailing list