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

Timestamp:

04/27/20 17:20:42 (5 years ago)

Author:

Eric.Larour

Message:

CHG: simplified test2002.m by skipping fields not stricly necessary for the slr solution.
In addition, created new 'hydro' material in the materials.m class. This triggered a series
of modifications to the model processor. The biggest was the fact that hmaterials hoooks in
the elements were pointing to materials that did not exist! So we did a post processing of the
hmaterials hooks to nullify them. This in trun triggered Tria.cpp modification of the Configure
routine to skip whenever hmaterial is NULL.

File:

• issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp (modified) (1 diff)

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

@@ -262 +262 @@
                 case 3: return MaticeEnum;
                 case 4: return MatenhancediceEnum;
-                case 5: return MatlithoEnum;
-                case 6: return MaterialsEnum;
+                case 5: return MaterialsEnum;
                 default: _error_("Marshalled materials code \""<<enum_in<<"\" not supported yet");
+        }
+}/*}}}*/
+int IoCodeToEnumNature(int enum_in){/*{{{*/
+        switch(enum_in){
+                case 1: return MatdamageiceEnum;
+                case 2: return MatestarEnum;
+                case 3: return MaticeEnum;
+                case 4: return MatenhancediceEnum;
+                case 5: return MaterialsEnum;
+                case 6: return MatlithoEnum;
+                case 7: return MathydroEnum;
+                default: _error_("Marshalled materials nature code \""<<enum_in<<"\" not supported yet");
         }
 }/*}}}*/