[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 2nd argument of latent_heating, process_latent_heating, process_adi_heating and process_visc_heating, which was set to the caps_per_proc loop variable (4a5ce9c)

[cig_noreply at geodynamics.org]

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

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

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

commit 4a5ce9c04a6c0a7afe3d074a5e35416642a45c46
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 12:06:24 2014 -0700

    Eliminated the 2nd argument of latent_heating, process_latent_heating, process_adi_heating and process_visc_heating, which was set to the caps_per_proc loop variable


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

4a5ce9c04a6c0a7afe3d074a5e35416642a45c46
 lib/Advection_diffusion.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/Advection_diffusion.c b/lib/Advection_diffusion.c
index 3419142..4b673ec 100644
--- a/lib/Advection_diffusion.c
+++ b/lib/Advection_diffusion.c
@@ -720,7 +720,7 @@ static void filter(struct All_variables *E)
 }
 
 
-static void process_visc_heating(struct All_variables *E, int m, double *heating)
+static void process_visc_heating(struct All_variables *E, double *heating)
 {
     void strain_rate_2_inv();
     int e, i;
@@ -747,7 +747,7 @@ static void process_visc_heating(struct All_variables *E, int m, double *heating
 }
 
 
-static void process_adi_heating(struct All_variables *E, int m, double *heating)
+static void process_adi_heating(struct All_variables *E, double *heating)
 {
     int e, ez, i, j;
     double matprop, temp1, temp2;
@@ -774,7 +774,7 @@ static void process_adi_heating(struct All_variables *E, int m, double *heating)
 }
 
 
-static void latent_heating(struct All_variables *E, int m,
+static void latent_heating(struct All_variables *E,
                            double *heating_latent, double *heating_adi,
                            float **B, float Ra, float clapeyron,
                            float depth, float transT, float inv_width)
@@ -815,7 +815,7 @@ static void latent_heating(struct All_variables *E, int m,
 }
 
 
-static void process_latent_heating(struct All_variables *E, int m,
+static void process_latent_heating(struct All_variables *E,
                                    double *heating_latent, double *heating_adi)
 {
     int e;
@@ -825,7 +825,7 @@ static void process_latent_heating(struct All_variables *E, int m,
         heating_latent[e] = 1.0;
 
     if(E->control.Ra_410 != 0.0) {
-        latent_heating(E, CPPR, heating_latent, heating_adi,
+        latent_heating(E, heating_latent, heating_adi,
                        E->Fas410, E->control.Ra_410,
                        E->control.clapeyron410, E->viscosity.z410,
                        E->control.transT410, E->control.inv_width410);
@@ -833,14 +833,14 @@ static void process_latent_heating(struct All_variables *E, int m,
     }
 
     if(E->control.Ra_670 != 0.0) {
-        latent_heating(E, CPPR, heating_latent, heating_adi,
+        latent_heating(E, heating_latent, heating_adi,
                        E->Fas670, E->control.Ra_670,
                        E->control.clapeyron670, E->viscosity.zlm,
                        E->control.transT670, E->control.inv_width670);
     }
 
     if(E->control.Ra_cmb != 0.0) {
-        latent_heating(E, CPPR, heating_latent, heating_adi,
+        latent_heating(E, heating_latent, heating_adi,
                        E->Fascmb, E->control.Ra_cmb,
                        E->control.clapeyroncmb, E->viscosity.zcmb,
                        E->control.transTcmb, E->control.inv_widthcmb);
@@ -880,10 +880,10 @@ static void process_heating(struct All_variables *E, int psc_pass)
     if(psc_pass == 0) {
         /* visc heating does not change between psc_pass, compute only
          * at first psc_pass */
-        process_visc_heating(E, CPPR, E->heating_visc[CPPR]);
+        process_visc_heating(E, E->heating_visc[CPPR]);
     }
-    process_adi_heating(E, CPPR, E->heating_adi[CPPR]);
-    process_latent_heating(E, CPPR, E->heating_latent[CPPR], E->heating_adi[CPPR]);
+    process_adi_heating(E, E->heating_adi[CPPR]);
+    process_latent_heating(E, E->heating_latent[CPPR], E->heating_adi[CPPR]);
 
     /* compute total amount of visc/adi heating over all processors
      * only at last psc_pass */