Changeset 16137 for issm/trunk/src/c/modules/ModelProcessorx/Dakota

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/ModelProcessorx (modified) (1 prop)
• src/c/modules/ModelProcessorx/Dakota (modified) (1 prop)
• src/c/modules/ModelProcessorx/Dakota/CMakeLists.txt (deleted)
• src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (modified) (4 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/c

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

issm/trunk/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp

@@ -36 +36 @@
         char*    name=NULL;
         int      numberofresponses;
-        int      numberofvertices;
         int      nrows;
         int      ncols;
@@ -52 +51 @@
                 iomodel->Constant(&name,MiscellaneousNameEnum);
                 iomodel->Constant(&numberofresponses,QmuNumberofresponsesEnum);
-                iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
 
                 /*name of qmu input, error and output files:{{{*/
@@ -92 +90 @@
                         ElementsAndVerticesPartitioning(&iomodel->my_elements,&iomodel->my_vertices,iomodel);
 
-                        dpart=xNew<double>(numberofvertices);
-                        for(i=0;i<numberofvertices;i++)dpart[i]=iomodel->my_vertices[i];
+                        dpart=xNew<double>(iomodel->numberofvertices);
+                        for(i=0;i<iomodel->numberofvertices;i++)dpart[i]=iomodel->my_vertices[i];
                 }
-                parameters->AddObject(new DoubleVecParam(QmuPartitionEnum,dpart,numberofvertices));
+                parameters->AddObject(new DoubleVecParam(QmuPartitionEnum,dpart,iomodel->numberofvertices));
                 /*}}}*/
                 /*Deal with data needed because of qmu variables: {{{*/
@@ -109 +107 @@
 
                                 /*Add to parameters: */
-                                if(nrows==numberofvertices){
+                                if(nrows==iomodel->numberofvertices){
                                         parameters->AddObject(new DoubleMatParam(StringToEnumx(tag),dakota_parameter,nrows,ncols));
                                 }

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp