[cig-commits] r7925 - mc/3D/CitcomS/trunk/lib
becker at geodynamics.org
becker at geodynamics.org
Tue Sep 4 16:09:14 PDT 2007
Author: becker
Date: 2007-09-04 16:09:14 -0700 (Tue, 04 Sep 2007)
New Revision: 7925
Modified:
mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
mc/3D/CitcomS/trunk/lib/Instructions.c
mc/3D/CitcomS/trunk/lib/Stokes_flow_Incomp.c
Log:
Added test for F=0 load vector bug, moved open_qfiles to after set_elapsed time.
Modified: mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c 2007-09-04 18:58:13 UTC (rev 7924)
+++ mc/3D/CitcomS/trunk/lib/Full_tracer_advection.c 2007-09-04 23:09:14 UTC (rev 7925)
@@ -157,7 +157,7 @@
E->trace.box_cushion=0.00001;
/* AKMA turn this back on after debugging */
- E->trace.itracer_warnings=1;
+ input_boolean("itracer_warnings",&(E->trace.itracer_warnings),"on",E->parallel.me);
/* Determine number of tracer quantities */
Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c 2007-09-04 18:58:13 UTC (rev 7924)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c 2007-09-04 23:09:14 UTC (rev 7925)
@@ -113,6 +113,16 @@
set_starting_age(E); /* set the starting age to elapsed time, if desired */
set_elapsed_time(E); /* reset to elapsed time to zero, if desired */
+
+ /* open the heatflow files here because we need to know about loc_me */
+ if(E->output.write_q_files)
+ open_qfiles(E);
+ else{
+ E->output.fpqt = E->output.fpqb = NULL;
+ }
+
+
+
if(E->control.lith_age)
lith_age_init(E);
@@ -1312,12 +1322,7 @@
open_log(E);
open_time(E);
open_info(E);
- if(E->output.write_q_files)
- open_qfiles(E);
- else{
- E->output.fpqt = E->output.fpqb = NULL;
- }
-
+
if (strcmp(E->output.format, "ascii") == 0) {
E->problem_output = output;
}
Modified: mc/3D/CitcomS/trunk/lib/Stokes_flow_Incomp.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Stokes_flow_Incomp.c 2007-09-04 18:58:13 UTC (rev 7924)
+++ mc/3D/CitcomS/trunk/lib/Stokes_flow_Incomp.c 2007-09-04 23:09:14 UTC (rev 7925)
@@ -708,6 +708,8 @@
v_res, gneq);
fprintf(stderr, "initial residue of momentum equation F %.9e %d\n",
v_res, gneq);
+ if(fabs(v_res) < 1e-7)
+ myerror(E,"something is probably wrong, zero residual of initial load vector?");
}
More information about the cig-commits
mailing list