[cig-commits] commit: No longer pass a Model to compute_Cp and compute_Cxyz since it is not needed.

[Mercurial]

changeset:   106:6cf74aa8c2b1
user:        Walter Landry <wlandry at caltech.edu>
date:        Thu Mar 22 10:54:23 2012 -0700
files:       compute_Cp.cxx compute_Cxyz.cxx main.cxx
description:
No longer pass a Model to compute_Cp and compute_Cxyz since it is not needed.


diff -r f9b5c217e7a4 -r 6cf74aa8c2b1 compute_Cp.cxx
--- a/compute_Cp.cxx	Wed Mar 21 16:13:22 2012 -0700
+++ b/compute_Cp.cxx	Thu Mar 22 10:54:23 2012 -0700
@@ -1,11 +1,10 @@
 #include "constants.hxx"
-#include "Model.hxx"
 #include <iostream>
 #include "compute_v_on_interface.hxx"
 #include "FTensor.hpp"
 #include "sign.hxx"
 
-void compute_Cp(const Model &model, const double zx[Nx+1][Ny],
+void compute_Cp(const double zx[Nx+1][Ny],
                 const double zy[Nx][Ny+1],
                 const double log_etax[Nx+1][Ny],
                 const double log_etay[Nx][Ny+1],
diff -r f9b5c217e7a4 -r 6cf74aa8c2b1 compute_Cxyz.cxx
--- a/compute_Cxyz.cxx	Wed Mar 21 16:13:22 2012 -0700
+++ b/compute_Cxyz.cxx	Thu Mar 22 10:54:23 2012 -0700
@@ -1,11 +1,10 @@
 #include "constants.hxx"
-#include "Model.hxx"
 #include <iostream>
 #include "compute_v_on_interface.hxx"
 #include "FTensor.hpp"
 #include "Interface.hxx"
 
-void compute_Cxyz(const Model &model, const double zx[Nx+1][Ny],
+void compute_Cxyz(const double zx[Nx+1][Ny],
                   const double zy[Nx][Ny+1],
                   const double log_etax[Nx+1][Ny],
                   const double log_etay[Nx][Ny+1],
diff -r f9b5c217e7a4 -r 6cf74aa8c2b1 main.cxx
--- a/main.cxx	Wed Mar 21 16:13:22 2012 -0700
+++ b/main.cxx	Thu Mar 22 10:54:23 2012 -0700
@@ -11,7 +11,7 @@ extern void initial(const Model &model, 
                     double p[Nx][Ny], double fx[Nx+1][Ny], double fy[Nx][Ny+1],
                     double distx[Nx+1][Ny], double disty[Nx][Ny+1]);
 
-extern void compute_Cxyz(const Model &model, const double zx[Nx+1][Ny],
+extern void compute_Cxyz(const double zx[Nx+1][Ny],
                          const double zy[Nx][Ny+1],
                          const double log_etax[Nx+1][Ny],
                          const double log_etay[Nx][Ny+1],
@@ -21,7 +21,7 @@ extern void compute_Cxyz(const Model &mo
                          const int &i, const int &j,
                          double &C, double &dCx_dz);
 
-extern void compute_Cp(const Model &model, const double zx[Nx+1][Ny],
+extern void compute_Cp(const double zx[Nx+1][Ny],
                        const double zy[Nx][Ny+1],
                        const double log_etax[Nx+1][Ny],
                        const double log_etay[Nx][Ny+1],
@@ -158,7 +158,7 @@ int main()
                       /* Compute the residual and update zx */
 
                       double Cx, dCx_dzx;
-                      compute_Cxyz(model,zx,zy,log_etax,log_etay,distx,disty,
+                      compute_Cxyz(zx,zy,log_etax,log_etay,distx,disty,
                                    0,i,j,Cx,dCx_dzx);
 
                       double Rx=2*dzx_xx + dzx_yy + dzy_xy 
@@ -269,7 +269,7 @@ int main()
                       /* Compute the residual and update zy */
 
                       double Cy, dCy_dzy;
-                      compute_Cxyz(model,zx,zy,log_etax,log_etay,distx,disty,
+                      compute_Cxyz(zx,zy,log_etax,log_etay,distx,disty,
                                    1,i,j,Cy,dCy_dzy);
                       double Ry=2*dzy_yy + dzy_xx + dzx_yx 
                         + 2*(dlog_etayy*zy[i][j] + dlog_etay*dzy_y)
@@ -327,7 +327,7 @@ int main()
               }
 
             double Cp;
-            compute_Cp(model,zx,zy,log_etax,log_etay,distx,disty,i,j,Cp);
+            compute_Cp(zx,zy,log_etax,log_etay,distx,disty,i,j,Cp);
             double Rc=dzx_x + dzy_y + dlog_etax*zx_avg + dlog_etay*zy_avg
               + Cp;
             
@@ -389,7 +389,7 @@ int main()
                   }
 
                 double Cx, dCx_dzx;
-                compute_Cxyz(model,zx,zy,log_etax,log_etay,distx,disty,
+                compute_Cxyz(zx,zy,log_etax,log_etay,distx,disty,
                              0,i,j,Cx,dCx_dzx);
 
                 double dRx_dzx=-6/(h*h);
@@ -423,7 +423,7 @@ int main()
                   }
 
                 double Cy, dCy_dzy;
-                compute_Cxyz(model,zx,zy,log_etax,log_etay,distx,disty,
+                compute_Cxyz(zx,zy,log_etax,log_etay,distx,disty,
                              1,i,j,Cy,dCy_dzy);
 
                 double dRy_dzy=-6/(h*h);