Changeset 24313 for issm/trunk/src/c/analyses/BalancethicknessAnalysis.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/analyses/BalancethicknessAnalysis.h (modified) (1 diff)

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/analyses/BalancethicknessAnalysis.h

@@ -15 +15 @@
                 void CreateConstraints(Constraints* constraints,IoModel* iomodel);
                 void CreateLoads(Loads* loads, IoModel* iomodel);
-                void CreateNodes(Nodes* nodes,IoModel* iomodel);
+                void CreateNodes(Nodes* nodes,IoModel* iomodel,bool isamr=false);
                 int  DofsPerNode(int** doflist,int domaintype,int approximation);
                 void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type);

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