Changeset 14814

Timestamp:

04/30/13 12:25:28 (12 years ago)

Author:

Eric.Larour

Message:

CHG: starting with dynamic allocation of load history. Need to transfer dynamic memory into the fortran kernels.

File:

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

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

@@ -14 +14 @@
 #include "../InputUpdateFromConstantx/InputUpdateFromConstantx.h"
 
-#define Nrsl 1
-#define N3G 1
-#define Nafter 1
 #define Ntime 2
 #define Ntimp 3
@@ -77 +74 @@
         /*constant: */
         int idisk=1; // disk #
+        IssmDouble yts;
 
         /*coming from the model structure, runtime configurable:*/
@@ -86 +84 @@
         IssmDouble ri; //radial distance from center of disk to vertex  i
         IssmDouble re; //radius of disk
-        IssmDouble current_he; //thickness at current time
         IssmDouble* hes; //loading history (in ice thickness)
         IssmDouble* times; //loading history times
@@ -111 +108 @@
         ri=arguments->ri;
         re=arguments->re;
-        current_he=arguments->current_he;
         hes=arguments->hes;
         times=arguments->times;
@@ -126 +122 @@
         irate=arguments->irate;
         iedge=arguments->iedge;
-
-        //printf("%g %g %g %i %g %g %g %g %g %g %g %g %i\n", ri,re,current_he,numtimes,currenttime,lithosphere_shear_modulus,lithosphere_density,mantle_shear_modulus,mantle_viscosity, mantle_density,lithosphere_thickness,rho_ice,disk_id);
+        yts=arguments->yts;
 
         /*}}}*/
@@ -147 +142 @@
       
         /*loading history: */
-        blocky_.zhload[0]=current_he;
-        blocky_.zhload[1]=current_he;
+        blocky_.zhload[0]=hes[1];
+        blocky_.zhload[1]=hes[numtimes-1];
 
         /*times: */
-        blockt_.time[0]=1.e-4;    // in kyr
+        blockt_.time[0]=times[1]/1000.0/yts;    // in kyr
         blockt_.time[1]=2500e+0;  // in kyr
-        blockt_.time[2]=2400e+0;  // control this for benchmark experiments
+        blockt_.time[2]=times[numtimes-1]/1000.0/yts;  // control this for benchmark experiments
 
         /*irate: */
@@ -162 +157 @@
         /*}}}*/
 
-        
         /*Call distme driver: */
         distme_(&idisk,&iedge);