[cig-commits] r4228 - in mc/3D/CitcomS/trunk: CitcomS/Solver bin
lib module
tan2 at geodynamics.org
tan2 at geodynamics.org
Fri Aug 4 14:46:21 PDT 2006
Author: tan2
Date: 2006-08-04 14:46:21 -0700 (Fri, 04 Aug 2006)
New Revision: 4228
Modified:
mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
mc/3D/CitcomS/trunk/bin/Citcom.c
mc/3D/CitcomS/trunk/lib/Output.c
mc/3D/CitcomS/trunk/lib/output.h
mc/3D/CitcomS/trunk/module/bindings.cc
mc/3D/CitcomS/trunk/module/outputs.cc
mc/3D/CitcomS/trunk/module/outputs.h
Log:
* Fixed skipped time output when monitoringFrequency > 1, which was introduced in r4118
* Forgot to change to the E->output function pointer in r4126
Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py 2006-08-04 20:51:39 UTC (rev 4227)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py 2006-08-04 21:46:21 UTC (rev 4228)
@@ -26,7 +26,7 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
-from CitcomSLib import CPU_time, output, return_dt, return_t, return_step
+from CitcomSLib import CPU_time, output, output_time, return_dt, return_t, return_step
from pyre.components.Component import Component
import journal
@@ -259,6 +259,8 @@
print self.coupler.exchanger.coupled_steps, monitoringFrequency
output(self.all_variables, step)
+ output_time(self.all_variables, step)
+
return
Modified: mc/3D/CitcomS/trunk/bin/Citcom.c
===================================================================
--- mc/3D/CitcomS/trunk/bin/Citcom.c 2006-08-04 20:51:39 UTC (rev 4227)
+++ mc/3D/CitcomS/trunk/bin/Citcom.c 2006-08-04 21:46:21 UTC (rev 4228)
@@ -55,7 +55,6 @@
void read_velocity_boundary_from_file();
void read_mat_from_file();
void open_time();
- void output();
void output_finalize();
void output_pseudo_surf();
@@ -115,9 +114,12 @@
output_pseudo_surf(E, E->monitor.solution_cycles);
}
else
- output(E, E->monitor.solution_cycles);
+ (E->output)(E, E->monitor.solution_cycles);
+ /* information about simulation time and wall clock time */
+ output_time(E, E->monitor.solution_cycles);
+
if (E->control.stokes) {
if(E->control.tracer==1)
@@ -164,6 +166,9 @@
(E->output)(E, E->monitor.solution_cycles);
}
+ /* information about simulation time and wall clock time */
+ output_time(E, E->monitor.solution_cycles);
+
if(E->control.mat_control==1)
read_mat_from_file(E);
/*
Modified: mc/3D/CitcomS/trunk/lib/Output.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output.c 2006-08-04 20:51:39 UTC (rev 4227)
+++ mc/3D/CitcomS/trunk/lib/Output.c 2006-08-04 21:46:21 UTC (rev 4228)
@@ -45,7 +45,6 @@
void output_stress(struct All_variables *, int);
void output_ave_r(struct All_variables *, int);
void output_tracer(struct All_variables *, int);
-void output_time(struct All_variables *, int);
extern void parallel_process_termination();
extern void heat_flux(struct All_variables *);
@@ -82,9 +81,6 @@
/* disable horizontal average output by Tan2 */
/* output_ave_r(E, cycles); */
- /* information about simulation time and wall clock time */
- output_time(E, cycles);
-
return;
}
Modified: mc/3D/CitcomS/trunk/lib/output.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/output.h 2006-08-04 20:51:39 UTC (rev 4227)
+++ mc/3D/CitcomS/trunk/lib/output.h 2006-08-04 21:46:21 UTC (rev 4228)
@@ -1,6 +1,6 @@
/*
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
+ *
*<LicenseText>
*
* CitcomS by Louis Moresi, Shijie Zhong, Lijie Han, Eh Tan,
@@ -22,7 +22,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*</LicenseText>
- *
+ *
*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
@@ -35,6 +35,7 @@
void output(struct All_variables *, int);
void output_pseudo_surf(struct All_variables *, int);
+void output_time(struct All_variables *, int);
FILE* output_open(char *);
Modified: mc/3D/CitcomS/trunk/module/bindings.cc
===================================================================
--- mc/3D/CitcomS/trunk/module/bindings.cc 2006-08-04 20:51:39 UTC (rev 4227)
+++ mc/3D/CitcomS/trunk/module/bindings.cc 2006-08-04 21:46:21 UTC (rev 4228)
@@ -210,6 +210,11 @@
METH_VARARGS,
pyCitcom_output_finalize__doc__},
+ {pyCitcom_output_time__name__,
+ pyCitcom_output_time,
+ METH_VARARGS,
+ pyCitcom_output_time__doc__},
+
// from setProperties.h
{pyCitcom_Advection_diffusion_set_properties__name__,
Modified: mc/3D/CitcomS/trunk/module/outputs.cc
===================================================================
--- mc/3D/CitcomS/trunk/module/outputs.cc 2006-08-04 20:51:39 UTC (rev 4227)
+++ mc/3D/CitcomS/trunk/module/outputs.cc 2006-08-04 21:46:21 UTC (rev 4228)
@@ -91,6 +91,27 @@
}
+char pyCitcom_output_time__doc__[] = "";
+char pyCitcom_output_time__name__[] = "output_time";
+
+PyObject * pyCitcom_output_time(PyObject *self, PyObject *args)
+{
+ PyObject *obj;
+ int cycles;
+
+ if (!PyArg_ParseTuple(args, "Oi:output_time", &obj, &cycles))
+ return NULL;
+
+ struct All_variables* E = static_cast<struct All_variables*>(PyCObject_AsVoidPtr(obj));
+
+ output_time(E, cycles);
+
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+
char pyCitcom_output_pseudo_surf__doc__[] = "";
char pyCitcom_output_pseudo_surf__name__[] = "output_pseudo_surf";
Modified: mc/3D/CitcomS/trunk/module/outputs.h
===================================================================
--- mc/3D/CitcomS/trunk/module/outputs.h 2006-08-04 20:51:39 UTC (rev 4227)
+++ mc/3D/CitcomS/trunk/module/outputs.h 2006-08-04 21:46:21 UTC (rev 4228)
@@ -39,6 +39,11 @@
extern "C"
PyObject * pyCitcom_output_finalize(PyObject *, PyObject *);
+extern char pyCitcom_output_time__name__[];
+extern char pyCitcom_output_time__doc__[];
+extern "C"
+PyObject * pyCitcom_output_time(PyObject *, PyObject *);
+
#endif
// version
More information about the cig-commits
mailing list