Changeset 24313 for issm/trunk/src/c/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.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/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp (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/modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp

@@ -9 +9 @@
 void InputUpdateFromVectorx(FemModel* femmodel,Vector<IssmDouble>* vector, int name, int type){
 
-        IssmDouble* serial_vector=vector->ToMPISerial();
-        InputUpdateFromVectorx(femmodel,serial_vector,name,type);
-        xDelete<IssmDouble>(serial_vector);
+        if(type==VertexPIdEnum){
+                IssmDouble* serial_vector=NULL;
+                femmodel->GetLocalVectorWithClonesVertices(&serial_vector,vector);
+                InputUpdateFromVectorx(femmodel,serial_vector,name,VertexLIdEnum);
+                xDelete<IssmDouble>(serial_vector);
+        }
+        else{
+                IssmDouble* serial_vector=vector->ToMPISerial();
+                InputUpdateFromVectorx(femmodel,serial_vector,name,type);
+                xDelete<IssmDouble>(serial_vector);
+        }
 }
 
 void InputUpdateFromVectorx(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->InputUpdateFromVector(vector,name,type);
         }
-        for(i=0;i<femmodel->loads->Size();i++){
-                Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
-                load->InputUpdateFromVector(vector,name,type);
-        }
-        for(i=0;i<femmodel->materials->Size();i++){
-                Material* material=(Material*)femmodel->materials->GetObjectByOffset(i);
-                material->InputUpdateFromVector(vector,name,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