Changeset 20362

Timestamp:

03/27/16 10:02:21 (9 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing Comm issue

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (1 diff)
• classes/Params/GenericParam.h (modified) (1 diff)
• datastructures/DataSet.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -735 +735 @@
                 xDelete<int>(this->analysis_type_list);
 
-                this->profiler = new Profiler();
-                this->loads = new Loads();
-                this->materials = new Materials();
-                this->parameters = new Parameters();
+                this->profiler    = new Profiler();
+                this->loads       = new Loads();
+                this->materials   = new Materials();
+                this->parameters  = new Parameters();
                 this->constraints = new Constraints();
-                this->results = new Results();
-                this->nodes = new Nodes();
-                this->vertices = new Vertices();
-                this->elements = new Elements();
+                this->results     = new Results();
+                this->nodes       = new Nodes();
+                this->vertices    = new Vertices();
+                this->elements    = new Elements();
         }
 

issm/trunk-jpl/src/c/classes/Params/GenericParam.h

@@ -46 +46 @@
                 void  Echo() {DeepEcho();};
                 int   Id(){ return -1; };
-                int   ObjectEnum() {return AdolcParamEnum;};
+                int   ObjectEnum() {return GenericParamEnum;};
 
                 // the "copy"  has to implement the base class abstract function

issm/trunk-jpl/src/c/datastructures/DataSet.cpp

@@ -122 +122 @@
 
                 /*Go through our objects, and marshall them into the buffer: */
-                for ( obj=this->objects.begin() ; obj < this->objects.end(); obj++ ){
+                for( obj=this->objects.begin() ; obj < this->objects.end(); obj++ ){
                         obj_enum=(*obj)->ObjectEnum();
                         MARSHALLING(obj_enum);
@@ -241 +241 @@
                                 this->AddObject(transparam);
                         }
+                        else if(obj_enum==GenericParamEnum){
+                                /*Skip for now (we don't want to Marhsall Comms*/
+                        }
                         else if(obj_enum==MaticeEnum){
                                 Matice* matice=NULL;