Changeset 12367

Timestamp:

06/05/12 09:26:30 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added threshold on covariances if h<0.00001

Location:

issm/trunk-jpl/src/c/objects/Kriging

Files:

• ExponentialVariogram.cpp (modified) (1 diff)
• GaussianVariogram.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/objects/Kriging/ExponentialVariogram.cpp

@@ -71 +71 @@
         h=sqrt(pow(deltax,2.)+pow(deltay,2.));
 
-        /*return covariance*/
+        /*If h is too small, return sill*/
+        if(h<0.0000001) return sill;
+
+        /*compute covariance*/
         a     = 1./3.;
         cova = (sill-nugget)*exp(-h/(a*range));

issm/trunk-jpl/src/c/objects/Kriging/GaussianVariogram.cpp

@@ -71 +71 @@
         h2=pow(deltax,2.)+pow(deltay,2.);
 
-        /*return covariance*/
+        /*If h is too small, return sill*/
+        if(h2<0.0000001) return sill;
+
+        /*compute covariance*/
         a     = 1./3.;
         cova = (sill-nugget)*exp(-h2/(a*range*range));
-
-        if(h2<0.0000001) cova = sill;
 
         return cova;