Changeset 167

Timestamp:

04/17/2005 10:44:17 AM (7 years ago)

Author:

powell

Message:

Major error in the flux calculation; runs MUCH faster now!

Files:

• trunk/matml/src/castabox/castabox.c (modified) (6 diffs)

trunk/matml/src/castabox/castabox.c

@@ -180 +180 @@
             flux_xm1 = 0.5 * (conductivity (localold_array[iz][iy][ix-1].H, p)+
                               conductivity (localold_array[iz][iy][ix].H, p)) *
-              (localold_array[iz][iy][ix-1].T - localold_array[iz][iy][ix].T);
+              (localold_array[iz][iy][ix-1].T - localold_array[iz][iy][ix].T) *
+              p.deltax_m1;
 
           if (ix == p.grid_x-1) /* Outer x boundary condition */
@@ -187 +188 @@
             flux_xp1 = 0.5 * (conductivity (localold_array[iz][iy][ix].H, p) +
                               conductivity (localold_array[iz][iy][ix+1].H,p))*
-              (localold_array[iz][iy][ix].T - localold_array[iz][iy][ix+1].T);
+              (localold_array[iz][iy][ix].T - localold_array[iz][iy][ix+1].T) *
+              p.deltax_m1;
 
           /* Calculate flux on y-1 and y+1 faces using average conductivity */
@@ -195 +197 @@
             flux_ym1 = 0.5 * (conductivity (localold_array[iz][iy-1][ix].H, p)+
                               conductivity (localold_array[iz][iy][ix].H, p)) *
-              (localold_array[iz][iy-1][ix].T - localold_array[iz][iy][ix].T);
+              (localold_array[iz][iy-1][ix].T - localold_array[iz][iy][ix].T) *
+              p.deltay_m1;
 
           if (iy == p.grid_y-1) /* Outer y boundary condition */
@@ -202 +205 @@
             flux_yp1 = 0.5 * (conductivity (localold_array[iz][iy][ix].H, p) +
                               conductivity (localold_array[iz][iy+1][ix].H,p))*
-              (localold_array[iz][iy][ix].T - localold_array[iz][iy+1][ix].T);
+              (localold_array[iz][iy][ix].T - localold_array[iz][iy+1][ix].T) *
+              p.deltay_m1;
 
           /* Calculate flux on z-1 and z+1 faces using average conductivity */
@@ -210 +214 @@
             flux_zm1 = 0.5 * (conductivity (localold_array[iz-1][iy][ix].H, p)+
                               conductivity (localold_array[iz][iy][ix].H, p)) *
-              (localold_array[iz-1][iy][ix].T - localold_array[iz][iy][ix].T);
+              (localold_array[iz-1][iy][ix].T - localold_array[iz][iy][ix].T) *
+              p.deltaz_m1;
 
           if (iz == p.grid_z-1) /* Top boundary condition: h, radiation */
@@ -225 +230 @@
             flux_zp1 = 0.5 * (conductivity (localold_array[iz][iy][ix].H, p) +
                               conductivity (localold_array[iz+1][iy][ix].H,p))*
-              (localold_array[iz][iy][ix].T - localold_array[iz+1][iy][ix].T);
+              (localold_array[iz][iy][ix].T - localold_array[iz+1][iy][ix].T) *
+              p.deltaz_m1;
 
           /* Calculate new enthalpy */