source: issm/oecreview/Archive/25834-26739/ISSM-26166-26167.diff

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

@@ -296 +296 @@
                 virtual void       JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss)=0;
                 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;
                 virtual IssmDouble MassFlux(IssmDouble* segment)=0;
@@ -379 +378 @@
                 virtual void          EsaGeodetic3D(Vector<IssmDouble>* pUp,Vector<IssmDouble>* pNorth,Vector<IssmDouble>* pEast,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble* xx,IssmDouble* yy,IssmDouble* zz)=0;
                 #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;
                 virtual IssmDouble    GetAreaSpherical(void)=0;

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

@@ -126 +126 @@
                 void           JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss);
                 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);
                 IssmDouble     MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id);

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

@@ -98 +98 @@
                 void        JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");};
                 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");};
                 IssmDouble  MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id){_error_("not implemented yet");}

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

@@ -104 +104 @@
                 void        JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");};
                 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");};
                 IssmDouble  MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id){_error_("not implemented yet");}

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

@@ -112 +112 @@
                 bool            IsIcefront(void);
                 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);
                 IssmDouble  MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id);
@@ -164 +163 @@
                 void    EsaGeodetic3D(Vector<IssmDouble>* pUp,Vector<IssmDouble>* pNorth,Vector<IssmDouble>* pEast,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble* xx,IssmDouble* yy,IssmDouble* zz);
                 #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);
                 void       GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,Matlitho* litho, IssmDouble* x,IssmDouble* y);