Changeset 191 for trunk/matml/src/castabox

Timestamp:

09/26/2005 10:31:27 PM (6 years ago)

Author:

powell

Message:

0.5: illum bug workaround, params output at start, date and doc update.

Files:

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

trunk/matml/src/castabox/castabox.c

@@ -28 +28 @@
 #ifdef DEBUG
 #define DPRINTF(fmt, args...) ierr = PetscPrintf (PETSC_COMM_WORLD, "%s: " fmt, __FUNCT__, args); CHKERRQ (ierr)
-#define NDPRINTF(fmt, args...)
 #else
 #define DPRINTF(fmt, args...)
-#define NDPRINTF(args...) ierr = PetscPrintf (PETSC_COMM_WORLD, args); CHKERRQ (ierr)
 #endif
 
@@ -37 +35 @@
    castabox -help */
 static char help[] =
-"Cast-a-box version 0.1 by Adam Powell March 21, 2003\n\
+"Cast-a-box version 0.5 by Adam Powell September 25, 2005\n\
 \n\
 This very simple program simulates 3-D heat conduction and solidification of\n\
@@ -69 +67 @@
   -top_tenv ##    [default 0.0]     -top_h ##         [default 0.5]\n\
   -top_epssig ##  [default 5.67e-11]\n\
-[The top surface has a mixed convection-radiation boundary condition which\n\
-defaults to radiation (h=0): q = h (T-Tenv) + epssig (T^4 - Tenv^4)]\n\
+[The top surface has a mixed convection-radiation boundary condition:\n\
+q = h (T-Tenv) + epssig (T^4 - Tenv^4)]\n\
 \n\
 The maximum possible explicit timestep size is calculated automatically from\n\
@@ -273 +271 @@
                     0.,0.,1.,.5, 1.,0.,1.,.5 };
   int ts=0, plots=6, keepon=1, ierr;
+  char outstring [101];
 
   DPRINTF ("Calculating maximum stable explicit timestep size.\n",0);
@@ -292 +291 @@
   ierr = DARestoreGlobalVector (box_da, &global); CHKERRQ (ierr);
 
-  DPRINTF ("Timestep %d (time %g): deltat = %g, Tmax=%g, Tmin=%g\n",
-           ts, current_time, deltat, Tmax, Tmin);
-  NDPRINTF ("\rTimestep %d (time %g): deltat=%g, Tmax=%g, Tmin=%g    \n",
+  snprintf (outstring,100,"Timestep %d (time %g): deltat %g, Tmax %g, Tmin %g",
             ts, current_time, deltat, Tmax, Tmin);
+#ifdef DEBUG
+  ierr = PetscPrintf (PETSC_COMM_WORLD, "%s\n", outstring); CHKERRQ (ierr);
+#else
+  strncat (outstring, "            ", 79-strlen(outstring));
+  ierr = PetscPrintf (PETSC_COMM_WORLD, "\r%s\n", outstring); CHKERRQ (ierr);
+#endif
 
   while (keepon)
@@ -352 +355 @@
                                       PETSC_NULL, PETSC_NULL, PETSC_NULL);
                 CHKERRQ (ierr);
+                /* Work-around for illuminator non-periodic bug */
+                minmax[1] = p.width_x * (p.grid_x-1) / p.grid_x;
+                minmax[3] = p.width_y * (p.grid_y-1) / p.grid_y;
+                minmax[5] = p.width_z * (p.grid_z-1) / p.grid_z;
                 ierr = GeomviewDisplayTriangulation
                   (PETSC_COMM_WORLD, minmax, "Temperature", PETSC_FALSE); CHKERRQ(ierr);
@@ -403 +410 @@
                 ts++;
 
-                DPRINTF ("Timestep %d (time %g): deltat = %g, Tmax=%g, Tmin=%g\n",
-                         ts, current_time, deltat, Tmax, Tmin);
-                NDPRINTF ("\rTimestep %d (time %g): deltat=%g, Tmax=%g, Tmin=%g    ",
+                snprintf (outstring,100,"Timestep %d (time %g): deltat %g, Tmax %g, Tmin %g",
                           ts, current_time, deltat, Tmax, Tmin);
+#ifdef DEBUG
+                ierr = PetscPrintf (PETSC_COMM_WORLD, "%s\n", outstring); CHKERRQ (ierr);
+#else
+                strncat (outstring, "            ", 79-strlen(outstring));
+                ierr = PetscPrintf (PETSC_COMM_WORLD, "\r%s", outstring); CHKERRQ (ierr);
+#endif
 
                 if (plots)
@@ -417 +428 @@
                                           PETSC_NULL, PETSC_NULL, PETSC_NULL);
                     CHKERRQ (ierr);
+                    /* Work-around for illuminator non-periodic bug */
+                    minmax[1] = p.width_x * (p.grid_x-1) / p.grid_x;
+                    minmax[3] = p.width_y * (p.grid_y-1) / p.grid_y;
+                    minmax[5] = p.width_z * (p.grid_z-1) / p.grid_z;
                     ierr = GeomviewDisplayTriangulation
                       (PETSC_COMM_WORLD, minmax, "Temperature", PETSC_FALSE); CHKERRQ(ierr);
                   }
               }
+#ifndef DEBUG
             if (count)
               {
-                NDPRINTF ("\n");
+                ierr = PetscPrintf (PETSC_COMM_WORLD, "\n"); CHKERRQ (ierr);
               }
+#endif
             break;
           }
@@ -520 +537 @@
   ierr = PetscOptionsGetScalar (PETSC_NULL, "-top_epssig", &p.top_epssig,
                                 PETSC_NULL); CHKERRQ (ierr);
+
+  DPRINTF ("Simulation parameters:\n",0);
+  DPRINTF ("Grid dimensions: %dx%dx%d, Physical dimensions: %gx%gx%g\n",
+           p.grid_x, p.grid_y, p.grid_z, p.width_x, p.width_y, p.width_z);
+  DPRINTF ("Liquid properties: k=%g, rho=%g, cp=%g, melt temp=%g\n",
+           p.liquid_k, p.liquid_rho, p.liquid_cp, p.melt_temp);
+  DPRINTF ("Solid properties:  k=%g, rho=%g, cp=%g, latent heat=%g\n",
+           p.solid_k, p.solid_rho, p.solid_cp, p.latent_heat);
+  DPRINTF ("Env. temperatures: xmax=%g, ymax=%g, top=%g, bottom=%g\n",
+           p.xmax_tenv, p.ymax_tenv, p.top_tenv, p.bottom_tenv);
+  DPRINTF ("h values: xmax=%g, ymax=%g, top=%g, bottom=%g, epssig=%g\n",
+           p.xmax_h, p.ymax_h, p.bottom_h, p.top_h, p.top_epssig);
 
   DPRINTF ("Creating the distributed array with box stencil of width 1,\n"