Changeset 14810

Timestamp:

04/30/13 12:23:10 (12 years ago)

Author:

Eric.Larour

Message:

CHG: got rid of current_he, added passing yts constant.
Also, now provides to GiaDeflectionCore the load history up to and including current time.

File:

• issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (modified) (6 diffs)

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

@@ -3083 +3083 @@
 
         /*thickness averages: */
-        IssmDouble current_he=NULL;
         IssmDouble* hes=NULL;
         IssmDouble* times=NULL;
@@ -3106 +3105 @@
         IssmDouble rho_ice;
 
+        /*constants: */
+        IssmDouble yts;
+
         /*output: */
         IssmDouble  wi;
@@ -3115 +3117 @@
         /*how many dofs are we working with here? */
         this->parameters->FindParam(&gsize,MeshNumberofverticesEnum);
+        this->parameters->FindParam(&yts,ConstantsYtsEnum);
 
         /*recover gia solution parameters: */
@@ -3134 +3137 @@
         thickness_input=inputs->GetInput(ThicknessEnum); 
         if (!thickness_input)_error_("thickness input needed to compute gia deflection!");
-        thickness_input->GetInputAllTimeAverages(&hes,&times,&numtimes);
-        thickness_input->GetInputAverage(&current_he);
-
+        thickness_input->GetInputUpToCurrentTimeAverages(&hes,&times,&numtimes,currenttime);
+        
         /*recover lithosphere thickness: */
         lithosphere_thickness_input=inputs->GetInput(GiaLithosphereThicknessEnum);
@@ -3155 +3157 @@
         /*start loading GiaDeflectionCore arguments: */
         arguments.re=re;
-        arguments.current_he=current_he;
         arguments.hes=hes;
         arguments.times=times;
@@ -3170 +3171 @@
         arguments.irate=output_rates;
         arguments.iedge=cross_section_shape;
+        arguments.yts=yts;
 
         for(i=0;i<gsize;i++){