Changeset 24656

Timestamp:

03/12/20 06:19:37 (5 years ago)

Author:

bdef

Message:

BUG:issue with large times in transient input

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (1 diff)
• classes/FemModel.cpp (modified) (1 diff)
• classes/Inputs2/TransientInput2.cpp (modified) (1 diff)
• cores/smb_core.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -2160 +2160 @@
                         if(offset == numtimesteps-1){
                                 dt = end_time - timesteps[offset];
+                                _assert_(dt>0.);
                         }
                         else{
-                                dt = timesteps[offset+1] - timesteps[offset]; _assert_(dt>0.);
+                                dt = timesteps[offset+1] - timesteps[offset];
+                                _assert_(dt>0.);
                         }
                 }

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -5260 +5260 @@
                                 int        *vertexlids = xNew<int>(numvertices);
                                 element->GetInputListOnVertices(&values[0],input_enum[i]);   //this is the enum to stack
+
                                 element->GetVerticesLidList(vertexlids);
 

issm/trunk-jpl/src/c/classes/Inputs2/TransientInput2.cpp

@@ -138 +138 @@
 void TransientInput2::AddTriaTimeInput(IssmDouble time,int numindices,int* indices,IssmDouble* values_in,int interp_in){/*{{{*/
 
+
         /*Check whether this is the last time step that we have*/
         if(this->numtimesteps){
-                if(this->timesteps[this->numtimesteps-1]>time-1.e-5 && this->timesteps[this->numtimesteps-1]<time+1.e-5){
+                if(abs(this->timesteps[this->numtimesteps-1]-time)<1.0e-5){
                         this->AddTriaTimeInput(this->numtimesteps-1,numindices,indices,values_in,interp_in);
                         return;

issm/trunk-jpl/src/c/cores/smb_core.cpp

@@ -69 +69 @@
 
                 femmodel->InitTransientInputx(&transientinput[0],numaveragedinput);
+                analysis = new SmbAnalysis();
                 while(substep<dtslices){ //loop on sub dts
                         substep+=1;
@@ -75 +76 @@
          if(VerboseSolution()) _printf0_("sub iteration " << substep << "/" << dtslices << "  time [yr]: " << setprecision(4) << subtime/yts << " (time step: " << subdt/yts << ")\n");
          if(VerboseSolution()) _printf0_("   computing smb\n");
-         analysis = new SmbAnalysis();
                         if(VerboseSolution()) _printf0_("   Calling core\n");
                         analysis->Core(femmodel);
          /*If we have a sub-timestep we store the substep inputs in a transient input here*/
          femmodel->StackTransientInputx(&substepinput[0],&transientinput[0],subtime,numaveragedinput);
-                        delete analysis;
                 }
+                delete analysis;
       /*averaging the transient input*/
                 femmodel->AverageTransientInputx(&transientinput[0],&averagedinput[0],global_time-dt,subtime,numaveragedinput);