Changeset 24946 for issm/trunk-jpl/src/c/classes/FemModel.cpp

Timestamp:

06/01/20 14:22:09 (5 years ago)

Author:

Eric.Larour

Message:

CHG: further optimization in the geodetic module, using the geometry module.

File:

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

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

@@ -4673 +4673 @@
 #endif
 #ifdef _HAVE_SEALEVELRISE_
-void FemModel::SealevelriseGeometry(IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius) { /*{{{*/
+void FemModel::SealevelriseGeometry(IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius, IssmDouble* xx, IssmDouble* yy, IssmDouble* zz) { /*{{{*/
 
         /*Run sealevelrie geometry routine in elements:*/
         for(int i=0;i<elements->Size();i++){
                 Element*   element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                element->SealevelriseGeometry(latitude,longitude,radius);
+                element->SealevelriseGeometry(latitude,longitude,radius,xx,yy,zz);
         }
 
@@ -4854 +4854 @@
 }
 /*}}}*/
-void FemModel::SealevelriseElastic(Vector<IssmDouble>* pUp, Vector<IssmDouble>* pNorth, Vector<IssmDouble>* pEast, Vector<IssmDouble>* pRSLg, SealevelMasks* masks, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius, IssmDouble* xx, IssmDouble* yy, IssmDouble* zz,int loop,int horiz){/*{{{*/
+void FemModel::SealevelriseElastic(Vector<IssmDouble>* pUp, Vector<IssmDouble>* pNorth, Vector<IssmDouble>* pEast, Vector<IssmDouble>* pRSLg, SealevelMasks* masks, IssmDouble* latitude, IssmDouble* longitude, IssmDouble* radius, IssmDouble* xx, IssmDouble* yy, IssmDouble* zz,int loop){/*{{{*/
 
         /*serialized vectors:*/
@@ -4863 +4863 @@
         IssmDouble* East  = NULL;
         int* indices = NULL;
-        int         gsize;
-
+        int  gsize;
+        int  horiz;
+        
+        /*retrieve parameters:*/
+        this->parameters->FindParam(&horiz,SealevelriseHorizEnum);
 
         /*Serialize vectors from previous iteration:*/
@@ -4880 +4883 @@
         for(int i=0;i<elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
-                element->SealevelriseGeodetic(Up,North,East,RSLg,masks, latitude,longitude,radius,xx,yy,zz,horiz);
+                element->SealevelriseGeodetic(Up,North,East,RSLg,masks, latitude,longitude,radius,xx,yy,zz);
         }