Changeset 3881

Timestamp:

05/21/10 13:14:05 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed thermal transient (still imperfect

File:

• issm/trunk/src/c/parallel/thermal_core.cpp (modified) (2 diffs)

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

@@ -75 +75 @@
                 
                 nsteps=(int)(ndt/dt);
-                time=(double*)xmalloc((nsteps+1)*sizeof(double));
-                time[0]=0;
+                time=(double*)xmalloc((nsteps)*sizeof(double));
 
                 /*allocate t_g and m_g arrays: */
-                t_g=(Vec*)xmalloc((nsteps+1)*sizeof(Vec));
-                m_g=(Vec*)xmalloc((nsteps+1)*sizeof(Vec));
-
-                //initialize temperature and melting
-                fem_t->FindParam(&t_g_serial,NULL,NULL,TemperatureEnum);
-                t_g[0]=SerialToVec(t_g_serial,numberofnodes);
-                xfree((void**)&t_g_serial);
-                fem_m->FindParam(&m_g_serial,NULL,NULL,MeltingRateEnum);
-                m_g[0]=SerialToVec(m_g_serial,numberofnodes);
-                xfree((void**)&m_g_serial);
+                t_g=(Vec*)xmalloc((nsteps)*sizeof(Vec));
+                m_g=(Vec*)xmalloc((nsteps)*sizeof(Vec));
 
                 for(i=0;i<nsteps;i++){
                         if(verbose)_printf_("time step: %i/%i\n",i+1,nsteps);
-                        time[i+1]=(i+1)*dt;
+                        time[i]=(i+1)*dt;
                         
                         if(verbose)_printf_("computing temperatures:\n");
-                        model->UpdateInputsFromVector(t_g[i],TemperatureEnum,VertexEnum);
-                        thermal_core_nonlinear(&t_g[i+1],&melting_offset,fem_t,ThermalAnalysisEnum,NoneAnalysisEnum);
+                        thermal_core_nonlinear(&t_g[i],&melting_offset,fem_t,ThermalAnalysisEnum,NoneAnalysisEnum);
                         
                         if(verbose)_printf_("computing melting:\n");
-                        model->UpdateInputsFromVector(t_g[i+1],TemperatureEnum,VertexEnum);
+                        model->UpdateInputsFromVector(t_g[i],TemperatureEnum,VertexEnum);
                         model->UpdateInputsFromConstant(melting_offset,MeltingOffsetEnum);
-                        diagnostic_core_linear(&m_g[i+1],fem_m,MeltingAnalysisEnum,NoneAnalysisEnum);
+                        diagnostic_core_linear(&m_g[i],fem_m,MeltingAnalysisEnum,NoneAnalysisEnum);
                 }
         }
@@ -118 +108 @@
         }
         else{
-                for(i=0;i<nsteps+1;i++){
+                for(i=0;i<nsteps;i++){
                         result=new Result(results->Size()+1,time[i],i+1,"t_g",t_g[i]);
                         results->AddObject(result);