Changeset 26167

Timestamp:

03/31/21 13:07:48 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing AD with new LevelsetAverage

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.h (modified) (2 diffs)
• Penta.h (modified) (1 diff)
• Seg.h (modified) (1 diff)
• Tetra.h (modified) (1 diff)
• Tria.h (modified) (2 diffs)

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

@@ -297 +297 @@
                 virtual void       JacobianDeterminantSurface(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss)=0;
                 virtual void       JacobianDeterminantTop(IssmDouble* Jdet,IssmDouble* xyz_list_base,Gauss* gauss)=0;
-                virtual void       LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum)=0;
                 virtual void       Marshall(MarshallHandle* marshallhandle)=0;
                 virtual IssmDouble Masscon(IssmDouble* levelset)=0;
@@ -380 +379 @@
                 #endif
                 #ifdef _HAVE_SEALEVELCHANGE_
+                virtual void          LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum){_error_("not implemented");};
                 virtual void          SetSealevelMasks(SealevelMasks* masks)=0;
                 virtual IssmDouble    GetArea3D(void)=0;

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -127 +127 @@
                 void           JacobianDeterminantSurface(IssmDouble*  pJdet, IssmDouble* xyz_list,Gauss* gauss);
                 void           JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss);
-                void           LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum){_error_("not implemented yet");};
                 IssmDouble     Masscon(IssmDouble* levelset){_error_("not implemented yet");};
                 IssmDouble     MassFlux(IssmDouble* segment);

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -99 +99 @@
                 void        JacobianDeterminantSurface(IssmDouble*  pJdet, IssmDouble* xyz_list,Gauss* gauss);
                 void        JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){_error_("not implemented yet");};
-                void        LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum){_error_("not implemented yet");};
                 IssmDouble  Masscon(IssmDouble* levelset){_error_("not implemented yet");};
                 IssmDouble  MassFlux(IssmDouble* segment){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tetra.h

@@ -105 +105 @@
                 void        JacobianDeterminantSurface(IssmDouble*  pJdet, IssmDouble* xyz_list,Gauss* gauss);
                 void        JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss);
-                void        LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum){_error_("not implemented yet");};
                 IssmDouble  Masscon(IssmDouble* levelset){_error_("not implemented yet");};
                 IssmDouble  MassFlux(IssmDouble* segment){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -113 +113 @@
                 bool        IsNodeOnShelfFromFlags(IssmDouble* flags);
                 bool        IsZeroLevelset(int levelset_enum);
-                void        LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum);
                 IssmDouble  Masscon(IssmDouble* levelset);
                 IssmDouble  MassFlux(IssmDouble* segment);
@@ -165 +164 @@
                 #endif
                 #ifdef _HAVE_SEALEVELCHANGE_
+                void       LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum);
                 void       SealevelchangeMomentOfInertia(IssmDouble* dI_list, IssmDouble* loads, IssmDouble* sealevelloads);
                 void       SealevelchangeGeometry(IssmDouble* lat, IssmDouble* longi,IssmDouble* radius, IssmDouble* xx, IssmDouble* yy, IssmDouble* zz, IssmDouble* xxe, IssmDouble* yye, IssmDouble* zze);