Changeset 21844

Timestamp:

07/24/17 13:04:03 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to fix AD:

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -10 +10 @@
 
 #include <stdio.h>
+#include <math.h>
 #include "../cores/cores.h"
 #include "../shared/io/io.h"
@@ -2443 +2444 @@
                         y = xyz_list[3*i+1];
                         
-                        bx=-150.-728.8*std::pow(x/300000.,2)+343.91*std::pow(x/300000.,4)-50.57*std::pow(x/300000.,6);
-                        by=500./(1.+std::exp((-2./4000.)*(y-80000./2.-24000.)))+500./(1.+std::exp((2./4000.)*(y-80000./2.+24000.)));
+                        bx=-150.-728.8*pow(x/300000.,2)+343.91*pow(x/300000.,4)-50.57*pow(x/300000.,6);
+                        by=500./(1.+exp((-2./4000.)*(y-80000./2.-24000.)))+500./(1.+exp((2./4000.)*(y-80000./2.+24000.)));
                         
                         r[i] = -720.;
@@ -3408 +3409 @@
                                 ftxy+=(tauxy[n]-smoothedtauxy[elem_vertices[n]])*basis[n];
                         }
-                        error+=Jdet*gauss->weight*( std::pow(ftxx,2)+std::pow(ftyy,2)+std::pow(ftxy,2) ); //e^2 
+                        error+=Jdet*gauss->weight*( pow(ftxx,2)+pow(ftyy,2)+pow(ftxy,2) ); //e^2 
                 }
                 /*Set the error in the global vector*/  
       sid=element->Sid();
-                velementerror->SetValue(sid,std::sqrt(error),INS_VAL);//sqrt( e^2 )
+                error = sqrt(error);//sqrt(e^2)
+                velementerror->SetValue(sid,error,INS_VAL);
                 /*Cleanup intermediaries*/
                 xDelete<IssmDouble>(xyz_list);
@@ -3558 +3560 @@
             fdHdy+=(GradH[1]-smoothed_dHdy[elem_vertices[n]])*basis[n];
          }
-         error+=Jdet*gauss->weight*( std::pow(fdHdx,2)+std::pow(fdHdy,2) ); //e^2
+         error+=Jdet*gauss->weight*(pow(fdHdx,2)+pow(fdHdy,2) ); //e^2
       }
       /*Set the error in the global vector*/
       sid=element->Sid();
-      velementerror->SetValue(sid,std::sqrt(error),INS_VAL);//sqrt( e^2 )
+                error = sqrt(error); //sqrt( e^2 )
+      velementerror->SetValue(sid,error,INS_VAL);
       /*Cleanup intermediaries*/
       xDelete<IssmDouble>(xyz_list);