Changeset 22758 for issm/trunk/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules (modified) (1 prop)
• src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp (modified) (1 diff)

issm/trunk/src/c

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

issm/trunk/src/c/modules

@@ -1 +1 @@
 .deps
+InputControlUpdatex
+InputScalex
+TriaSearchx

@@ -1 +1 @@
 .deps
+InputControlUpdatex
+InputScalex
+TriaSearchx

issm/trunk/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp

@@ -18 +18 @@
 void InputUpdateFromVectorDakotax(FemModel* femmodel,IssmDouble* vector, int name, int type){
 
-        int i;
-
         /*Update elements, nodes, loads and materials from inputs: */
-        for(i=0;i<femmodel->elements->Size();i++){
+        for(int i=0;i<femmodel->elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 element->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<femmodel->loads->Size();i++){
+        for(int i=0;i<femmodel->loads->Size();i++){
                 Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
                 load->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<femmodel->materials->Size();i++){
+        for(int i=0;i<femmodel->materials->Size();i++){
                 Material* material=(Material*)femmodel->materials->GetObjectByOffset(i);
                 material->InputUpdateFromVectorDakota(vector,name,type);
         }
+        for(int i=0;i<femmodel->constraints->Size();i++){
+                Constraint* constraint=(Constraint*)femmodel->constraints->GetObjectByOffset(i);
+                constraint->InputUpdateFromVectorDakota(vector,femmodel->nodes,name,type);
+        }
 }

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -1 +1 @@
 .deps
+InputControlUpdatex
+InputScalex
+TriaSearchx