Changeset 24938 for issm/trunk-jpl/src/c/classes/Elements/Element.h

Timestamp:

05/31/20 00:21:13 (5 years ago)

Author:

Eric.Larour

Message:

CHG: optimizing sea level masks. Create new SealevelMasks classs
and new sealevelrise_core_masks that pre compute masks, and then
gets cores quick access to them.

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.h (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.h ¶

@@ -30 +30 @@
 class DatasetInput2;
 class IoModel;
+class SealevelMasks;
 class Gauss;
 class ElementVector;
@@ -373 +374 @@
                 #endif
                 #ifdef _HAVE_SEALEVELRISE_
+                virtual void          SetSealevelMasks(SealevelMasks* masks)=0;
                 virtual IssmDouble    GetArea3D(void)=0;
                 virtual IssmDouble    GetAreaSpherical(void)=0;
-                virtual IssmDouble    OceanAverage(IssmDouble* Sg)=0;
-                virtual IssmDouble    OceanArea(void)=0;
-                virtual void          SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old,IssmDouble eartharea)=0;
-                virtual void          SealevelriseEustatic(IssmDouble* Sgi, IssmDouble* peustatic,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble oceanarea,IssmDouble eartharea)=0;
+                virtual IssmDouble    OceanAverage(IssmDouble* Sg, SealevelMasks* masks)=0;
+                virtual void          SealevelriseMomentOfInertia(IssmDouble* dI_list,IssmDouble* Sg_old, SealevelMasks* masks,IssmDouble eartharea)=0;
+                virtual void          SealevelriseEustatic(IssmDouble* Sgi, IssmDouble* peustatic,SealevelMasks* masks,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble oceanarea,IssmDouble eartharea)=0;
                 virtual void          SealevelriseGeometry(IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius)=0;
-                virtual void          SealevelriseNonEustatic(IssmDouble* Sgo, IssmDouble* Sg_old,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble eartharea)=0;
-                virtual void          SealevelriseGeodetic(IssmDouble* Up, IssmDouble* North, IssmDouble* East, IssmDouble* Sg,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble* xx,IssmDouble* yy,IssmDouble* zz,IssmDouble eartharea,int horiz)=0;
+                virtual void          SealevelriseNonEustatic(IssmDouble* Sgo, IssmDouble* Sg_old,SealevelMasks* masks,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble eartharea)=0;
+                virtual void          SealevelriseGeodetic(IssmDouble* Up, IssmDouble* North, IssmDouble* East, IssmDouble* Sg,SealevelMasks* masks,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble* xx,IssmDouble* yy,IssmDouble* zz,IssmDouble eartharea,int horiz)=0;
                 #endif