Changeset 4728

Timestamp:

07/22/10 10:11:42 (15 years ago)

Author:

Mathieu Morlighem

Message:

added double precision criterion to time stepping check

Location:

issm/trunk/src

Files:

• c/solutions/transient2d_core.cpp (modified) (4 diffs)
• c/solutions/transient3d_core.cpp (modified) (3 diffs)
• m/solutions/transient2d_core.m (modified) (2 diffs)
• m/solutions/transient3d_core.m (modified) (2 diffs)

issm/trunk/src/c/solutions/transient2d_core.cpp ¶

@@ -9 +9 @@
 #include "./solutions.h"
 #include "../modules/modules.h"
+#include <float.h>
 
 void transient2d_core(FemModel* femmodel){
@@ -15 +16 @@
 
         /*parameters: */
-        int verbose=0;
+        int    verbose       = 0;
         double finaltime;
-        double dt;
-        int solution_type;
+        double dt,yts;
+        int    solution_type;
         
         /*intermediary: */
@@ -28 +29 @@
         femmodel->parameters->FindParam(&finaltime,NdtEnum);
         femmodel->parameters->FindParam(&dt,DtEnum);
+        femmodel->parameters->FindParam(&yts,YtsEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
 
@@ -34 +36 @@
         time=0;
 
-        while(time<finaltime){ //make sure we run up to finaltime.
+        while(time < finaltime - (yts*DBL_EPSILON)){ //make sure we run up to finaltime.
         
                 /*Increment*/

issm/trunk/src/c/solutions/transient3d_core.cpp ¶

@@ -11 +11 @@
 #include "../include/include.h"
 #include "../solvers/solvers.h"
+#include <float.h>
 
 void transient3d_core(FemModel* femmodel){
 
         /*parameters: */
-        int verbose=0;
+        int    verbose       = 0;
         double finaltime;
-        double dt;
-        int solution_type;
+        double dt,yts;
+        int    solution_type;
         
         /*intermediary: */
@@ -28 +29 @@
         femmodel->parameters->FindParam(&finaltime,NdtEnum);
         femmodel->parameters->FindParam(&dt,DtEnum);
+        femmodel->parameters->FindParam(&yts,YtsEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
 
@@ -34 +36 @@
         time=0;
 
-        while(time<finaltime){ //make sure we run up to finaltime.
+        while(time < finaltime - (yts*DBL_EPSILON)){ //make sure we run up to finaltime.
 
                 /*Increment*/

issm/trunk/src/m/solutions/transient2d_core.m ¶

@@ -9 +9 @@
         ndt=femmodel.parameters.Ndt;
         dt=femmodel.parameters.Dt;
+        yts=femmodel.parameters.Yts;
         solution_type=femmodel.parameters.SolutionType;
 
@@ -16 +17 @@
 
         %Loop through time
-        while time<ndt,
+        while (time < ndt - (yts*eps)),
 
                 %increment

issm/trunk/src/m/solutions/transient3d_core.m ¶

@@ -9 +9 @@
         ndt=femmodel.parameters.Ndt;
         dt=femmodel.parameters.Dt;
+        yts=femmodel.parameters.Yts;
         solution_type=femmodel.parameters.SolutionType;
 
@@ -16 +17 @@
 
         %Loop through time
-        while time<ndt,
+        while (time < ndt - (yts*eps)),
 
                 %Increment