Changeset 23992

Timestamp:

06/06/19 15:51:44 (6 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added Kill ice berg module (not debugged yet)

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/Elements/Element.cpp (modified) (4 diffs)
• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (1 diff)
• modules/KillIcebergsx (added)
• modules/KillIcebergsx/KillIcebergsx.cpp (added)
• modules/KillIcebergsx/KillIcebergsx.h (added)
• modules/modules.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -483 +483 @@
 issm_sources += ./analyses/LevelsetAnalysis.cpp
 issm_sources += ./modules/Calvingx/Calvingx.cpp
+issm_sources += ./modules/KillIcebergsx/KillIcebergsx.cpp
 endif
 if EXTRAPOLATION

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

@@ -1411 +1411 @@
 
 /*      /\*Fill in values*\/ */
-/*      this->GetVertexPidList(vertexpidlist); */
+/*      this->GetVerticesPidList(vertexpidlist); */
 /*      this->GetInputListOnVertices(values,input_enum); */
 /*      vector->SetValues(numvertices,vertexpidlist,values,INS_VAL); */
@@ -1441 +1441 @@
                         values = xNew<IssmDouble>(numvertices);
                         /*Fill in values*/
-                        this->GetVertexPidList(doflist);
+                        this->GetVerticesPidList(doflist);
                         this->GetInputListOnVertices(values,input_enum);
                         vector->SetValues(numvertices,doflist,values,INS_VAL);
@@ -1492 +1492 @@
                 values = xNew<IssmDouble>(numvertices);
                 /*Fill in values*/
-                this->GetVertexPidList(doflist);
+                this->GetVerticesPidList(doflist);
                 this->GetInputListOnVerticesAtTime(values,input_enum,time);
                 vector->SetValues(numvertices,doflist,values,INS_VAL);
@@ -1514 +1514 @@
 }
 /*}}}*/
-void       Element::GetVertexPidList(int* pidlist){/*{{{*/
+void       Element::GetVerticesLidList(int* lidlist){/*{{{*/
+
+        int numvertices = this->GetNumberOfVertices();
+        for(int i=0;i<numvertices;i++) lidlist[i]=vertices[i]->Lid();
+
+}
+/*}}}*/
+void       Element::GetVerticesPidList(int* pidlist){/*{{{*/
 
         int numvertices = this->GetNumberOfVertices();

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

@@ -104 +104 @@
                 void               GetVectorFromInputs(Vector<IssmDouble>* vector, int name_enum, int type);
                 void               GetVectorFromInputs(Vector<IssmDouble>* vector, int name_enum, int type,IssmDouble time);
-                void                 GetVertexPidList(int* pidlist);
+                void                 GetVerticesLidList(int* lidlist);
+                void                 GetVerticesPidList(int* pidlist);
                 void               GetVerticesConnectivityList(int* connectivitylist);
                 void               GetVerticesCoordinates(IssmDouble** xyz_list);

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

@@ -211 +211 @@
         /*Figure out the average for this element: */
         this->GetVerticesSidList(&offsetsid[0]);
-        this->GetVertexPidList(&offsetdof[0]);
+        this->GetVerticesPidList(&offsetdof[0]);
         mean=0;
         for(i=0;i<NUMVERTICES;i++){

issm/trunk-jpl/src/c/modules/modules.h

@@ -58 +58 @@
 #include "./KMLOverlayx/KMLOverlayx.h"
 #include "./Exp2Kmlx/Exp2Kmlx.h"
+#include "./KillIcebergsx/KillIcebergsx.h"
 #include "./Kml2Expx/Kml2Expx.h"
 #include "./Krigingx/Krigingx.h"