Changeset 4473

Timestamp:

07/08/10 15:12:53 (15 years ago)

Author:

seroussi

Message:

fixed thermal steady

Location:

issm/trunk/src/c

Files:

• solutions/thermal_core.cpp (modified) (1 diff)
• solvers/solver_thermal_nonlinear.cpp (modified) (1 diff)

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

@@ -49 +49 @@
                 if(verbose)_printf_("saving results:\n");
                 if(solution_type==ThermalSolutionEnum){
-                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,i,time);
-                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum,i,time);
+                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,i+1,time);
+                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum,i+1,time);
                 }
 

issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp

@@ -129 +129 @@
         VecFree(&tf);
         VecFree(&tf_old);
-        delete solver_string;
+        xfree((void**)&solver_string);
 
         /*Assign output pointers: */
-        *ptg=tg;
-        *pmelting_offset=melting_offset;
+        if(ptg)*ptg=tg;
+        else VecFree(&tg);
+        if(pmelting_offset)*pmelting_offset=melting_offset;
 }