Changeset 14837

Timestamp:

05/01/13 16:22:19 (12 years ago)

Author:

adhikari

Message:

CHG: Default numtimes=5, for Ivins benchmarks

File:

• issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp

@@ -14 +14 @@
 #include "../InputUpdateFromConstantx/InputUpdateFromConstantx.h"
 
-#define Ntime 2
-#define Ntimp 3
+#define Ntime 5 // number of times with load history 
+#define Ntimm 4 // Ntime-1 : for slope/y-cept of load segments 
+#define Ntimp 6 // Ntime+1 : for evaluation time  
 
 /*External blocks: {{{*/
@@ -24 +25 @@
 struct blockt{
         double time[Ntimp];
-        double bi[Ntime];
-        double dmi[Ntime];
+        double bi[Ntimm];
+        double dmi[Ntimm];
 };
 
@@ -142 +143 @@
 
         /*loading history: */
-        blocky_.zhload[0]=hes[1];
-        blocky_.zhload[1]=hes[numtimes-1];
+        blocky_.zhload[0]=hes[0];
+        blocky_.zhload[1]=hes[1];
+        blocky_.zhload[2]=hes[2];
+        blocky_.zhload[3]=hes[3];
+        blocky_.zhload[4]=hes[numtimes-1];
 
         /*times: */
-        blockt_.time[0]=times[1]/1000.0/yts;    // in kyr
-        blockt_.time[1]=2500e+0;  // in kyr
-        blockt_.time[2]=times[numtimes-1]/1000.0/yts;  // control this for benchmark experiments
+        blockt_.time[0]=times[0]/1000.0/yts;    // in kyr
+        blockt_.time[1]=times[1]/1000.0/yts;    // in kyr
+        blockt_.time[2]=times[2]/1000.0/yts;    // in kyr
+        blockt_.time[3]=times[3]/1000.0/yts;    // in kyr
+        blockt_.time[4]=2500.0;                 // in kyr  
+        blockt_.time[5]=times[numtimes-1]/1000.0/yts;  // evaluation time, in kyr 
 
         /*irate: */