source: issm/oecreview/Archive/20545-21336/ISSM-20691-20692.diff@ 21337

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

@@ -87 +87 @@
                                 /*Ok, we are dealing with a variable that is distributed over nodes. Recover the name of the variable (ex: scaled_Thickness): */
                                 sscanf(variabledescriptors[i],"scaled_%s",tag);
 
+                                /*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{
+                                        _error_("Tag \""<<tag<<"\" not supported yet");
+                                }
+
                                 /*Recover data: */
-                                iomodel->FetchData(&dakota_parameter,&nrows,&ncols,StringToEnumx(tag));
+                                iomodel->FetchData(&dakota_parameter,&nrows,&ncols,modelfield);
                                 if(nrows==iomodel->numberofvertices){
-                                        parameters->AddObject(new DoubleMatParam(StringToEnumx(tag),dakota_parameter,nrows,ncols));
+                                        parameters->AddObject(new DoubleMatParam(param_enum,dakota_parameter,nrows,ncols));
                                 }
                                 else{
-                                        parameters->AddObject(new DoubleTransientMatParam(StringToEnumx(tag),dakota_parameter,nrows,ncols));
+                                        parameters->AddObject(new DoubleTransientMatParam(param_enum,dakota_parameter,nrows,ncols));
                                 }
                                 xDelete<double>(dakota_parameter);
+                                xDelete<char>(fieldname);
                         }
                 }