Changeset 21829

Timestamp:

07/20/17 12:51:28 (8 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to fix windows build

File:

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

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

@@ -2419 +2419 @@
                 element->GetVerticesCoordinates(&xyz_list);
                 for(int i=0;i<numvertices;i++){
-                        x = *(xyz_list+3*i+0);
-                        y = *(xyz_list+3*i+1);
+                        x = xyz_list[3*i+0];
+                        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.)));
                         
-                        r[i]=std::max(bx+by,-720.);
+                        r[i] = -720.;
+                        if(bx+by>-720.) r[i] = bx+by;
                 }       
 
@@ -2437 +2438 @@
    /*Delete*/
    xDelete<IssmDouble>(r);
-        
-        return;
 }
 /*}}}*/