Changeset 20888

Timestamp:

07/12/16 14:17:58 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: centralize code that converts number to enums

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (modified) (1 diff)
• shared/io/Marshalling/IoCodeConversions.cpp (added)
• shared/io/Marshalling/IoCodeConversions.h (added)
• shared/io/io.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -99 +99 @@
                                         ./shared/io/Print/PrintfFunction.cpp\
                                         ./shared/io/Comm/IssmComm.cpp\
+                                        ./shared/io/Marshalling/IoCodeConversions.cpp \
                                         ./shared/LatLong/Ll2xyx.cpp\
                                         ./shared/LatLong/Xy2llx.cpp\

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

@@ -88 +88 @@
                                 sscanf(variabledescriptors[i],"scaled_%s",tag);
 
-                                /*Convert tag to field name*/
-                                char* fieldname = NULL;
+                                /*Get field name and input enum from tag*/
+                                char* fieldname  = NULL;
                                 int   param_enum = -1;
-                                if(strcmp(tag,"Thickness")==0){
-                                        const char* field = "md.geometry.thickness";
-                                        param_enum        = ThicknessEnum;
-                                        fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
-                                }
-                                else if(strcmp(tag,"MaterialsRheologyB")==0){
-                                        const char* field = "md.materials.rheology_B";
-                                        param_enum        = MaterialsRheologyBEnum;
-                                        fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
-                                }
-                                else if(strcmp(tag,"SmbMassBalance")==0){
-                                        const char* field = "md.smb.mass_balance";
-                                        param_enum        = SmbMassBalanceEnum;
-                                        fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
-                                }
-                                else if(strcmp(tag,"FrictionCoefficient")==0){
-                                        const char* field = "md.friction.coefficient";
-                                        param_enum        = FrictionCoefficientEnum;
-                                        fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
-                                }
-                                else{
-                                        _error_("Tag \""<<tag<<"\" not supported yet");
-                                }
+                                FieldAndEnumFromCode(&param_enum,&fieldname,tag);
 
                                 /*Recover data: */

issm/trunk-jpl/src/c/shared/io/io.h

@@ -16 +16 @@
 #include "./Print/Print.h"
 #include "./Marshalling/Marshalling.h"
+#include "./Marshalling/IoCodeConversions.h"
 
 #endif  /* _IO_H_ */