Changeset 20692

Timestamp:

06/03/16 10:38:47 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to fix dakota

File:

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

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

@@ -88 +88 @@
                                 sscanf(variabledescriptors[i],"scaled_%s",tag);
 
-                                /*Recover data: */
-                                iomodel->FetchData(&dakota_parameter,&nrows,&ncols,StringToEnumx(tag));
-                                if(nrows==iomodel->numberofvertices){
-                                        parameters->AddObject(new DoubleMatParam(StringToEnumx(tag),dakota_parameter,nrows,ncols));
+                                /*Convert tag to field name*/
+                                char* fieldname = NULL;
+                                int   param_enum = -1;
+                                if(strcmp(tag,"Thickness")){
+                                        const char* field = "md.geometry.thickness";
+                                        param_enum        = ThicknessEnum;
+                                        fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
                                 }
                                 else{
-                                        parameters->AddObject(new DoubleTransientMatParam(StringToEnumx(tag),dakota_parameter,nrows,ncols));
+                                        _error_("Tag \""<<tag<<"\" not supported yet");
+                                }
+
+                                /*Recover data: */
+                                iomodel->FetchData(&dakota_parameter,&nrows,&ncols,modelfield);
+                                if(nrows==iomodel->numberofvertices){
+                                        parameters->AddObject(new DoubleMatParam(param_enum,dakota_parameter,nrows,ncols));
+                                }
+                                else{
+                                        parameters->AddObject(new DoubleTransientMatParam(param_enum,dakota_parameter,nrows,ncols));
                                 }
                                 xDelete<double>(dakota_parameter);
+                                xDelete<char>(fieldname);
                         }
                 }