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

Last change on this file since 27230 was 26740, checked in by Mathieu Morlighem, 3 years ago

CHG: added 25834-26739
File size: 6.0 KB
RevLine 
[26740]1Index: ../trunk-jpl/src/c/classes/Elements/Element.h
2===================================================================
3--- ../trunk-jpl/src/c/classes/Elements/Element.h (revision 26166)
4+++ ../trunk-jpl/src/c/classes/Elements/Element.h (revision 26167)
5@@ -296,7 +296,6 @@
6 virtual void JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss)=0;
7 virtual void JacobianDeterminantSurface(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss)=0;
8 virtual void JacobianDeterminantTop(IssmDouble* Jdet,IssmDouble* xyz_list_base,Gauss* gauss)=0;
9- virtual void LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum)=0;
10 virtual void Marshall(MarshallHandle* marshallhandle)=0;
11 virtual IssmDouble Masscon(IssmDouble* levelset)=0;
12 virtual IssmDouble MassFlux(IssmDouble* segment)=0;
13@@ -379,6 +378,7 @@
14 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;
15 #endif
16 #ifdef _HAVE_SEALEVELCHANGE_
17+ virtual void LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum){_error_("not implemented");};
18 virtual void SetSealevelMasks(SealevelMasks* masks)=0;
19 virtual IssmDouble GetArea3D(void)=0;
20 virtual IssmDouble GetAreaSpherical(void)=0;
21Index: ../trunk-jpl/src/c/classes/Elements/Penta.h
22===================================================================
23--- ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 26166)
24+++ ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 26167)
25@@ -126,7 +126,6 @@
26 void JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss);
27 void JacobianDeterminantSurface(IssmDouble* pJdet, IssmDouble* xyz_list,Gauss* gauss);
28 void JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss);
29- void LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum){_error_("not implemented yet");};
30 IssmDouble Masscon(IssmDouble* levelset){_error_("not implemented yet");};
31 IssmDouble MassFlux(IssmDouble* segment);
32 IssmDouble MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id);
33Index: ../trunk-jpl/src/c/classes/Elements/Seg.h
34===================================================================
35--- ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 26166)
36+++ ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 26167)
37@@ -98,7 +98,6 @@
38 void JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");};
39 void JacobianDeterminantSurface(IssmDouble* pJdet, IssmDouble* xyz_list,Gauss* gauss);
40 void JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss){_error_("not implemented yet");};
41- void LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum){_error_("not implemented yet");};
42 IssmDouble Masscon(IssmDouble* levelset){_error_("not implemented yet");};
43 IssmDouble MassFlux(IssmDouble* segment){_error_("not implemented yet");};
44 IssmDouble MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id){_error_("not implemented yet");}
45Index: ../trunk-jpl/src/c/classes/Elements/Tetra.h
46===================================================================
47--- ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 26166)
48+++ ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 26167)
49@@ -104,7 +104,6 @@
50 void JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");};
51 void JacobianDeterminantSurface(IssmDouble* pJdet, IssmDouble* xyz_list,Gauss* gauss);
52 void JacobianDeterminantTop(IssmDouble* pJdet,IssmDouble* xyz_list_base,Gauss* gauss);
53- void LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum){_error_("not implemented yet");};
54 IssmDouble Masscon(IssmDouble* levelset){_error_("not implemented yet");};
55 IssmDouble MassFlux(IssmDouble* segment){_error_("not implemented yet");};
56 IssmDouble MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id){_error_("not implemented yet");}
57Index: ../trunk-jpl/src/c/classes/Elements/Tria.h
58===================================================================
59--- ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 26166)
60+++ ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 26167)
61@@ -112,7 +112,6 @@
62 bool IsIcefront(void);
63 bool IsNodeOnShelfFromFlags(IssmDouble* flags);
64 bool IsZeroLevelset(int levelset_enum);
65- void LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum);
66 IssmDouble Masscon(IssmDouble* levelset);
67 IssmDouble MassFlux(IssmDouble* segment);
68 IssmDouble MassFlux(IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2,int segment_id);
69@@ -164,6 +163,7 @@
70 void EsaGeodetic3D(Vector<IssmDouble>* pUp,Vector<IssmDouble>* pNorth,Vector<IssmDouble>* pEast,IssmDouble* latitude,IssmDouble* longitude,IssmDouble* radius,IssmDouble* xx,IssmDouble* yy,IssmDouble* zz);
71 #endif
72 #ifdef _HAVE_SEALEVELCHANGE_
73+ void LevelsetAverage(IssmDouble* paverage, IssmDouble* parea, IssmDouble* field_on_localvertices, int levelsetenum);
74 void SealevelchangeMomentOfInertia(IssmDouble* dI_list, IssmDouble* loads, IssmDouble* sealevelloads);
75 void SealevelchangeGeometry(IssmDouble* lat, IssmDouble* longi,IssmDouble* radius, IssmDouble* xx, IssmDouble* yy, IssmDouble* zz, IssmDouble* xxe, IssmDouble* yye, IssmDouble* zze);
76 void GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,Matlitho* litho, IssmDouble* x,IssmDouble* y);
Note: See TracBrowser for help on using the repository browser.