Changeset 14553

Timestamp:

04/12/13 08:34:51 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: missing step, all the results were in step=1

File:

• issm/trunk-jpl/src/c/solutions/hydrology_core.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/solutions/hydrology_core.cpp

@@ -18 +18 @@
 
         /*intermediary*/
-        int        nsteps;
+        int        step,nsteps;
         int        output_frequency;
         bool       save_results;
@@ -25 +25 @@
         IssmDouble time,dt;
 
-        //first recover parameters common to all solutions
+        /*first recover parameters common to all solutions*/
         femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum);
         femmodel->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum);
@@ -31 +31 @@
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
         femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum);
+
         /*first compute slopes: */
         surfaceslope_core(femmodel);
@@ -41 +42 @@
         }
         else nsteps=reCast<int,IssmDouble>((final_time-starttime)/dt);
+
+        /*initialize: */
+        step=0;
         time=starttime;
 
@@ -48 +52 @@
                 if(nsteps)if(VerboseSolution()) _pprintLine_("time step:" << i+1 << "/" << nsteps);
                 time+=dt;
+                step+=1;
                 femmodel->parameters->SetParam(time,TimeEnum);
+                femmodel->parameters->SetParam(step,StepEnum);
 
                 /*Compute hydrology solution: */