Changeset 27726

Timestamp:

05/04/23 16:41:01 (23 months ago)

Author:

barkaoui

Message:

Bug:fixing adolc sealevelcore recast bug

Location:

issm/trunk-jpl/src/c

Files:

• analyses/SealevelchangeAnalysis.cpp (modified) (1 diff)
• modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/SealevelchangeAnalysis.cpp

@@ -470 +470 @@
                          *with steps equal to timeacc:*/
                         if(viscous){
-                                nt=reCast<int>((final_time-start_time)/timeacc)+1;
+                                nt=reCast<int,IssmDouble>((final_time-start_time)/timeacc)+1;
 #ifdef _HAVE_AD_
                                 G_viscoelastic_interpolated=xNew<IssmDouble>(M*nt,"t");

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

@@ -88 +88 @@
         IssmPDouble* blockt_time=xNew<IssmPDouble>(Ntimp);
         for(int i=0;i<Ntimp;i++){
-                blockt_time[i]=times[i]/1000.0/yts; 
-                if(i==numtimes-1) blockt_time[i]=reCast<IssmPDouble>(times[numtimes-1])/1000.0/yts; // final loading time, same as evaluation time
-                if(i==numtimes)   blockt_time[i]=reCast<IssmPDouble>(times[numtimes-1])/1000.0/yts;   // evaluation time
+                blockt_time[i]=reCast<IssmPDouble>(times[i]/1000.0/yts); 
+                if(i==numtimes-1) blockt_time[i]=reCast<IssmPDouble>(times[numtimes-1]/1000.0/yts); // final loading time, same as evaluation time
+                if(i==numtimes)   blockt_time[i]=reCast<IssmPDouble>(times[numtimes-1]/1000.0/yts);   // evaluation time
         }