Changeset 567 for issm/trunk

Timestamp:

05/21/09 14:17:28 (16 years ago)

Author:

Mathieu Morlighem

Message:

added time output for thermal transient

Location:

issm/trunk/src/c/parallel

Files:

• OutputThermal.cpp (modified) (2 diffs)
• thermal.cpp (modified) (5 diffs)

issm/trunk/src/c/parallel/OutputThermal.cpp

@@ -12 +12 @@
 #include "../objects/objects.h"
 
-void OutputThermal(Vec* t_g,Vec* m_g, FemModel* femmodels,char* filename){
+void OutputThermal(Vec* t_g,Vec* m_g, double* time,FemModel* femmodels,char* filename){
 
         int i;
@@ -90 +90 @@
                 WriteDataToDisk(&nsteps,NULL,NULL,"Integer",fid);
 
+                /*Write time steps: */
+                WriteDataToDisk(&time,&nsteps,&one,"Mat",fid);
+
                 /*Write solutions to disk: */
                 for(i=0;i<=nsteps;i++){

issm/trunk/src/c/parallel/thermal.cpp

@@ -32 +32 @@
         double* u_g=NULL;
         double* p_g=NULL;
+        double* time=NULL;
         double  dt;
         double  ndt;
@@ -100 +101 @@
         if(sub_analysis_type==SteadyAnalysisEnum()){
 
+                time=(double*)xmalloc(sizeof(double));
+                time[0]=0;
+
                 /*allocate t_g and m_g arrays: */
                 t_g=(Vec*)xmalloc(sizeof(Vec));
@@ -111 +115 @@
                 if(debug)_printf_("computing melting:\n");
                 diagnostic_core_linear(&m_g[0],&femmodels[1],inputs,MeltingAnalysisEnum(),SteadyAnalysisEnum());
+                PetscSynchronizedPrintf(MPI_COMM_WORLD,"melting_offset=%g\n",melting_offset);
+                PetscSynchronizedFlush(MPI_COMM_WORLD);
+                VecView(m_g[0],PETSC_VIEWER_STDOUT_WORLD);
+
         }
         else{
                 
                 nsteps=(int)(ndt/dt);
+                time=(double*)xmalloc((nsteps+1)*sizeof(double));
 
                 /*allocate t_g and m_g arrays: */
@@ -132 +141 @@
                 for(i=0;i<nsteps;i++){
                         if(debug)_printf_("time step: %i/%i\n",n,nsteps);
+                        time[i]=n*dt;
                         
                         if(debug)_printf_("computing temperatures:\n");
@@ -145 +155 @@
 
         _printf_("write results to disk:\n");
-        OutputThermal(t_g,m_g,&femmodels[0],outputfilename);
+        OutputThermal(t_g,m_g,time,&femmodels[0],outputfilename);
 
         _printf_("write lock file:\n");