Changeset 24988 for issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp

Timestamp:

06/08/20 22:58:53 (5 years ago)

Author:

Eric.Larour

Message:

CHG: more integration of partition vectors into variables. Slowly stepping
away from the qmu.vpartition vector paradigm, not yet fully though.

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (modified) (4 diffs)

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

@@ -13 +13 @@
         /*variable declarations*/
         int          i;
-        double      *vpart                  = NULL;
-        double      *epart                  = NULL;
-        int          npart;
         char       **responsedescriptors    = NULL;
         int          numresponsedescriptors;
@@ -35 +32 @@
         int   numberofresponses;
         int   nrows,ncols;
+
+        //variable partitions: 
+        IssmDouble **array                      = NULL;
+        int         *mdims_array                = NULL;
+        int         *ndims_array                = NULL;
+        int          num_partitions;
 
         /*recover parameters: */
@@ -70 +73 @@
                 /*Load partitioning vectors (both vertex and element based: */
                 parameters->AddObject(iomodel->CopyConstantObject("md.qmu.numberofpartitions",QmuNumberofpartitionsEnum));
-                iomodel->FetchData(&vpart,&npart,NULL,"md.qmu.vpartition"); if(!vpart) _error_("md.qmu.vpartition is empty");
-                parameters->AddObject(new DoubleVecParam(QmuVpartitionEnum,vpart,npart));
                 
-                iomodel->FetchData(&epart,&npart,NULL,"md.qmu.epartition"); if(!epart) _error_("md.qmu.epartition is empty");
-                parameters->AddObject(new DoubleVecParam(QmuEpartitionEnum,epart,npart));
+                /*Load partitioning vectors specific to variables:*/
+                iomodel->FetchData(&array,&mdims_array,&ndims_array,&num_partitions,"md.qmu.variablepartitions");
+                parameters->AddObject(new DoubleMatArrayParam(QmuVariablePartitionsEnum,array,num_partitions,mdims_array,ndims_array));
+
 
                 /*Deal with data needed because of qmu variables*/
@@ -114 +117 @@
                 }
                 xDelete<char*>(variabledescriptors);
-                xDelete<double>(vpart);
-                xDelete<double>(epart);
                 xDelete<char>(qmuinname);
                 xDelete<char>(qmuerrname);
                 xDelete<char>(qmuoutname);
+
+                for(i=0;i<num_partitions;i++){
+                        IssmDouble* matrix=array[i];
+                        xDelete<IssmDouble>(matrix);
+                }
+                xDelete<int>(mdims_array); 
+                xDelete<int>(ndims_array);
+                xDelete<IssmDouble*>(array);
+
         }