Changeset 25257

Timestamp:

07/10/20 17:08:57 (5 years ago)

Author:

Eric.Larour

Message:

CHG: if code 8 comes in, ignore it, don't error out. So we can do UQ based on mme
classes.

File:

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

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

@@ -114 +114 @@
                 for(i=0;i<numvariabledescriptors;i++){
                         if (strncmp(variabledescriptors[i],"scaled_",7)==0){
-                                /*Ok, we are dealing with a variable that is distributed over nodes. Recover the name of the variable (ex: scaled_Thickness): */
+                                int code;
+
+                                /*Ok, we are dealing with a variable that is distributed over nodes or elements. Recover the name of the variable (ex: scaled_Thickness): */
                                 sscanf(variabledescriptors[i],"scaled_%s",tag);
 
@@ -122 +124 @@
                                 FieldAndEnumFromCode(&param_enum,&fieldname,tag);
 
-                                /*Recover data: */
-                                iomodel->FetchData(&dakota_parameter,&nrows,&ncols,fieldname);
-                                if(nrows==iomodel->numberofvertices){
-                                        dataset_variable_descriptors->AddObject(new DoubleMatParam(param_enum,dakota_parameter,nrows,ncols));
+                                iomodel->SetFilePointerToData(&code,NULL,fieldname);
+                                if(code==8) dataset_variable_descriptors->AddObject(new DoubleParam(param_enum,8)); //skip MatArray inputs, as we don't know which input will be scaled yet!
+                                else{ 
+                                        /*recover more classic data, arrays and scalar mainly:*/
+                                        iomodel->FetchData(&dakota_parameter,&nrows,&ncols,fieldname);
+                                        if(nrows==iomodel->numberofvertices || nrows==iomodel->numberofelements){
+                                                dataset_variable_descriptors->AddObject(new DoubleMatParam(param_enum,dakota_parameter,nrows,ncols));
+                                        }
+                                        else{
+                                                dataset_variable_descriptors->AddObject(new DoubleTransientMatParam(param_enum,dakota_parameter,nrows,ncols));
+                                        }
+                                        xDelete<double>(dakota_parameter);
                                 }
-                                else{
-                                        dataset_variable_descriptors->AddObject(new DoubleTransientMatParam(param_enum,dakota_parameter,nrows,ncols));
-                                }
-                                xDelete<double>(dakota_parameter);
                                 xDelete<char>(fieldname);
                         }