Changeset 13276

Timestamp:

09/06/12 14:02:24 (13 years ago)

Author:

Eric.Larour

Message:

CHG: overloaded function prototype to access either string or enum as response descriptor

Location:

issm/trunk-jpl/src/c/modules/Responsex

Files:

• Responsex.cpp (modified) (2 diffs)
• Responsex.h (modified) (1 diff)

issm/trunk-jpl/src/c/modules/Responsex/Responsex.cpp

@@ -14 +14 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../toolkits/toolkits.h"
+#include "./Responsex.h"
 #include "../modules.h"
 
 void Responsex(IssmDouble* responses,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,const char* response_descriptor,bool process_units,int weight_index){
 
-        switch (StringToEnumx(response_descriptor)){
+        int response_descriptor_enum;
+
+        response_descriptor_enum=StringToEnumx(response_descriptor);
+        Responsex(responses, elements, nodes,  vertices, loads, materials,  parameters,response_descriptor_enum, process_units, weight_index);
+
+}
+
+void Responsex(IssmDouble* responses,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,int response_descriptor_enum,bool process_units,int weight_index){
+
+        switch (response_descriptor_enum){
 
                 #ifdef _HAVE_RESPONSES_
@@ -49 +59 @@
                 case VelEnum:ElementResponsex(responses, elements,nodes, vertices, loads, materials, parameters,VelEnum,process_units); break;
                 case FrictionCoefficientEnum:NodalValuex(responses, FrictionCoefficientEnum,elements,nodes, vertices, loads, materials, parameters,process_units); break;
-                default: _error_("response descriptor \"" << response_descriptor << "\" not supported yet!"); break;
+                default: _error_("response descriptor \"" << EnumToStringx(response_descriptor_enum) << "\" not supported yet!"); break;
                 #else
                 default: _error_("ISSM was not compiled with responses capabilities, exiting!");

issm/trunk-jpl/src/c/modules/Responsex/Responsex.h

@@ -10 +10 @@
 
 void Responsex(IssmDouble* presponse,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,const char* response_descriptor,bool process_units,int weight_index);
+void Responsex(IssmDouble* presponse,Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,int response_descriptor_enum,bool process_units,int weight_index);
 
 #endif  /* _RESPONSESXX_H */