[cig-commits] r6966 - mc/3D/CitcomCU/branches/inflow-bcs/src
tan2 at geodynamics.org
tan2 at geodynamics.org
Fri May 25 13:21:53 PDT 2007
Author: tan2
Date: 2007-05-25 13:21:53 -0700 (Fri, 25 May 2007)
New Revision: 6966
Modified:
mc/3D/CitcomCU/branches/inflow-bcs/src/Citcom.c
Log:
Disable maxT check, since the plume temperature can exceed 1.5
Modified: mc/3D/CitcomCU/branches/inflow-bcs/src/Citcom.c
===================================================================
--- mc/3D/CitcomCU/branches/inflow-bcs/src/Citcom.c 2007-05-25 19:50:38 UTC (rev 6965)
+++ mc/3D/CitcomCU/branches/inflow-bcs/src/Citcom.c 2007-05-25 20:21:53 UTC (rev 6966)
@@ -4,7 +4,7 @@
* within the Earth's mantle. Cartesian and regional-spherical geometries
* are implemented. See the file README contained with this distribution
* for further details.
- *
+ *
* Copyright (C) 1994-2005 California Institute of Technology
* Copyright (C) 2000-2005 The University of Colorado
*
@@ -19,18 +19,18 @@
* 2750 East Washington Blvd, Suite 210
* Pasadena, CA 91007
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or any
* later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -124,13 +124,13 @@
/**/ report(&E, "Process results of velocity solver");
process_new_velocity(&E, E.monitor.solution_cycles);
-
+ /*
if(E.monitor.T_interior > 1.5)
{
fprintf(E.fp, "quit due to maxT = %.4e sub_iteration%d\n", E.monitor.T_interior, E.advection.last_sub_iterations);
parallel_process_termination();
}
-
+ */
if(E.parallel.me == 0)
{
fprintf(E.fp, "CPU total = %g & CPU = %g for step %d time = %.4e dt = %.4e maxT = %.4e sub_iteration%d markers=%d\n", CPU_time0() - start_time, CPU_time0() - time, E.monitor.solution_cycles, E.monitor.elapsed_time, E.advection.timestep, E.monitor.T_interior, E.advection.last_sub_iterations, E.advection.markers_g);
More information about the cig-commits
mailing list