Changeset 26050

Timestamp:

03/08/21 19:22:44 (4 years ago)

Author:

Eric.Larour

Message:

CHG: moving from GIA to SEALEVEL

File:

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

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

@@ -4667 +4667 @@
 /*}}}*/
 #endif
-#ifdef _HAVE_GIA_
-void FemModel::IvinsDeformation(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt, IssmDouble* x, IssmDouble* y){ /*{{{*/
-
-        /*Find the litho material to be used by all the elements:*/
-        Matlitho* matlitho=NULL;
-        for (Object* & object: this->materials->objects){
-                Material* material=xDynamicCast<Material*>(object);
-                if(material->ObjectEnum()==MatlithoEnum){
-                        matlitho=xDynamicCast<Matlitho*>(material);
-                        break;
-                }
-        }
-        _assert_(matlitho);
-
-
-        /*Go through elements, and add contribution from each element to the deflection vector wg:*/
-        for(Object* & object : this->elements->objects){
-                Element* element = xDynamicCast<Element*>(object);
-                element->GiaDeflection(wg,dwgdt, matlitho, x,y);
-        }
-}
-/*}}}*/
-#endif
 #ifdef _HAVE_ESA_
 void FemModel::EsaGeodetic2D(Vector<IssmDouble>* pUp, Vector<IssmDouble>* pNorth, Vector<IssmDouble>* pEast, Vector<IssmDouble>* pX, Vector<IssmDouble>* pY, IssmDouble* xx, IssmDouble* yy){/*{{{*/
@@ -5111 +5088 @@
 
         return oceanvalue/oceanarea;
+}
+/*}}}*/
+void FemModel::IvinsDeformation(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt, IssmDouble* x, IssmDouble* y){ /*{{{*/
+
+        /*Find the litho material to be used by all the elements:*/
+        Matlitho* matlitho=NULL;
+        for (Object* & object: this->materials->objects){
+                Material* material=xDynamicCast<Material*>(object);
+                if(material->ObjectEnum()==MatlithoEnum){
+                        matlitho=xDynamicCast<Matlitho*>(material);
+                        break;
+                }
+        }
+        _assert_(matlitho);
+
+
+        /*Go through elements, and add contribution from each element to the deflection vector wg:*/
+        for(Object* & object : this->elements->objects){
+                Element* element = xDynamicCast<Element*>(object);
+                element->GiaDeflection(wg,dwgdt, matlitho, x,y);
+        }
 }
 /*}}}*/