Changeset 24157

Timestamp:

09/24/19 14:21:33 (5 years ago)

Author:

Eric.Larour

Message:

CHG: changes reqauired to run sea level solution update on Dakota + element partitioning update.

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (1 diff)
• modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (modified) (4 diffs)
• modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.cpp (modified) (1 diff)
• modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (modified) (2 diffs)
• shared/io/Marshalling/IoCodeConversions.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -5946 +5946 @@
                         break;
 
+                case ElementEnum:
+                        IssmDouble value;
+                        /*Get value for the element: */
+                        value=vector[this->Sid()]; //careful, vector of values here is not parallel distributed, but serial distributed (from a serial Dakota core!)
+                        this->inputs->AddInput(new TriaInput(name,&value,P0Enum));
+                        break;
                 default:
                         _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");

issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp

@@ -16 +16 @@
 
         int     numberofvertices;
+        int     numberofelements;
         int     nrows;
         int     ncols;
         int     npart;
         double *qmu_part  = NULL;
+        int     qmu_npart;
 
         double *distributed_values = NULL;
@@ -28 +30 @@
         /*retrieve parameters: */
         femmodel->parameters->FindParam(&npart,QmuNumberofpartitionsEnum);
-        femmodel->parameters->FindParam(&qmu_part,&dummy,QmuPartitionEnum);
+        femmodel->parameters->FindParam(&qmu_part,&qmu_npart,QmuPartitionEnum);
         numberofvertices=femmodel->vertices->NumberOfVertices();
+        numberofelements=femmodel->elements->NumberOfElements();
 
         /*Go through all dakota descriptors, ex: "rho_ice","thermal_conductivity","thickness1","thickness2", etc ..., and 
@@ -56 +59 @@
                         femmodel->parameters->FindParamInDataset(&parameter,&nrows,&ncols,QmuVariableDescriptorsEnum,StringToEnumx(root));
 
-                        /*We've got the parameter, we need to update it using qmu_part (a partitioning vector), 
-                         * and the distributed_values. Two cases: we either have a nrows=numberofvertices, in 
-                         * which case our parameter is a vector, or nrows=numberofvertices+1, in which case, 
-                         * our parameter is a transient vector. Deal with both cases accordingly: */
-                        for(k=0;k<numberofvertices;k++){
-                                for(l=0;l<ncols;l++){
-                                        *(parameter+ncols*k+l)=*(parameter+ncols*k+l)*distributed_values[(int)qmu_part[k]];
+
+                        /*We've got the parameter, we need to update it using qmu_part and the distributed_values. 
+                         * Several cases: we either have a nrows=numberofvertices or nrows=numberofelements, and 
+                         * in addition, it can be either a static or transient (nrows+1) vector. 
+                         * Deal with both cases accordingly: */
+                        //_printf_("nrows: " << nrows << " numberofvertices: " << numberofvertices << " qmu_npart: " << qmu_npart << "\n");
+
+                        if (qmu_npart==numberofvertices){
+                                for(k=0;k<numberofvertices;k++){
+                                        for(l=0;l<ncols;l++){
+                                                *(parameter+ncols*k+l)=*(parameter+ncols*k+l)*distributed_values[(int)qmu_part[k]];
+                                        }
                                 }
                         }
+                        else if (qmu_npart==numberofelements){
+                                for(k=0;k<numberofelements;k++){
+                                        for(l=0;l<ncols;l++){
+                                                *(parameter+ncols*k+l)=*(parameter+ncols*k+l)*distributed_values[(int)qmu_part[k]];
+                                        }
+                                }
+
+                        }
+                        else _error_("partitioning vector should be either elements or vertex sized!");
 
                         #ifdef _DEBUG_
@@ -83 +100 @@
 
                         /*Update inputs using the parameter matrix: */
-                        InputUpdateFromMatrixDakotax(femmodel, parameter, nrows,ncols,StringToEnumx(root), VertexEnum);
+                        if(qmu_npart==numberofvertices)
+                                InputUpdateFromMatrixDakotax(femmodel, parameter, nrows,ncols,StringToEnumx(root), VertexEnum);
+                        else
+                                InputUpdateFromMatrixDakotax(femmodel, parameter, nrows,ncols,StringToEnumx(root), ElementEnum);
 
                         /*increment i to skip the distributed values just collected: */

issm/trunk-jpl/src/c/modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.cpp

@@ -11 +11 @@
 
         int i;
-        int numberofvertices;
+        int numberofvertices,numberofelements;
 
         numberofvertices=femmodel->vertices->NumberOfVertices();
+        numberofelements=femmodel->elements->NumberOfElements();
 
-        if((ncols==1) && (nrows==numberofvertices)) InputUpdateFromVectorDakotax(femmodel,matrix,name,type);
+        if((ncols==1) && (nrows==numberofvertices | nrows==numberofelements)) InputUpdateFromVectorDakotax(femmodel,matrix,name,type);
         else{
 

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

@@ -15 +15 @@
         int         *part                   = NULL;
         double      *dpart                  = NULL;
+        int          npart;
         char       **responsedescriptors    = NULL;
         int          numresponsedescriptors;
@@ -68 +69 @@
                 /*partition vertices in iomodel->qmu_npart parts, unless a partition is already present: */
                 parameters->AddObject(iomodel->CopyConstantObject("md.qmu.numberofpartitions",QmuNumberofpartitionsEnum));
-                iomodel->FetchData(&dpart,NULL,NULL,"md.qmu.partition");
+                iomodel->FetchData(&dpart,&npart,NULL,"md.qmu.partition");
                 if(!dpart) _error_("md.qmu.partition is empty");
-                parameters->AddObject(new DoubleVecParam(QmuPartitionEnum,dpart,iomodel->numberofvertices));
+                parameters->AddObject(new DoubleVecParam(QmuPartitionEnum,dpart,npart));
 
                 /*Deal with data needed because of qmu variables*/

issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp

@@ -163 +163 @@
                 fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
         }
+        else if(strcmp(string_in,"SealevelriseDeltathickness")==0){
+                const char* field = "md.slr.deltathickness";
+                input_enum        = SealevelriseDeltathicknessEnum;
+                fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
+        }
         else{
                 _error_("Field \""<<string_in<<"\" not supported yet");