Changeset 24313 for issm/trunk/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp

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/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp (modified) (3 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/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 
-void CreateNodalConstraintsx( Vector<IssmDouble>** pys, Nodes* nodes,int configuration_type){
+void CreateNodalConstraintsx( Vector<IssmDouble>** pys, Nodes* nodes){
 
         bool  oldalloc  = false;
@@ -20 +20 @@
 
         /*figure out how many dofs we have: */
-        ssize=nodes->NumberOfDofs(configuration_type,SsetEnum);
-        slocalsize = nodes->NumberOfDofsLocal(configuration_type,SsetEnum);
+        ssize=nodes->NumberOfDofs(SsetEnum);
+        slocalsize = nodes->NumberOfDofsLocal(SsetEnum);
 
         /*allocate:*/
@@ -33 +33 @@
         for(int i=0;i<nodes->Size();i++){
                 Node* node=(Node*)nodes->GetObjectByOffset(i);
-                if (node->InAnalysis(configuration_type)){
-                        node->CreateNodalConstraints(ys);
-                }
+                node->CreateNodalConstraints(ys);
         }
 

@@ -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