Changeset 24313 for issm/trunk/src/c/classes/Loads/Riftfront.h

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Loads/Riftfront.h (modified) (4 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

issm/trunk/src/c/classes/Loads/Riftfront.h

@@ -18 +18 @@
         public:
                 int             id;
-                int     analysis_type;
 
                 /*properties*/
@@ -29 +28 @@
                 /*hooks: */
                 Hook* hnodes;
+                Hook* hvertices;
                 Hook* helements;
-                Hook* hmatpar;
 
                 /*Corresponding fields*/
-                Matpar   *matpar;
                 Node    **nodes;
+                Vertex  **vertices;
                 Element **elements;
 
@@ -53 +52 @@
                 /*Riftfrontconstructors,destructors: {{{*/
                 Riftfront();
-                Riftfront(int riftfront_id,int i, IoModel* iomodel,int analysis_type);
+                Riftfront(int riftfront_id,int i, IoModel* iomodel);
                 ~Riftfront();
                 /*}}}*/
@@ -81 +80 @@
                 void  GetNodesSidList(int* sidlist);
                 int   GetNumberOfNodes(void);
-                bool  InAnalysis(int analysis_type);
                 bool  IsPenalty(void);
                 void  PenaltyCreateJacobianMatrix(Matrix<IssmDouble>* Jff,IssmDouble kmax){_error_("Not implemented yet");};

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota