Changeset 13276


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/modules/Responsex/Responsex.cpp

    r13056 r13276  
    1414#include "../../EnumDefinitions/EnumDefinitions.h"
    1515#include "../../toolkits/toolkits.h"
     16#include "./Responsex.h"
    1617#include "../modules.h"
    1718
    1819void 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){
    1920
    20         switch (StringToEnumx(response_descriptor)){
     21        int response_descriptor_enum;
     22
     23        response_descriptor_enum=StringToEnumx(response_descriptor);
     24        Responsex(responses, elements, nodes,  vertices, loads, materials,  parameters,response_descriptor_enum, process_units, weight_index);
     25
     26}
     27
     28void 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){
     29
     30        switch (response_descriptor_enum){
    2131
    2232                #ifdef _HAVE_RESPONSES_
     
    4959                case VelEnum:ElementResponsex(responses, elements,nodes, vertices, loads, materials, parameters,VelEnum,process_units); break;
    5060                case FrictionCoefficientEnum:NodalValuex(responses, FrictionCoefficientEnum,elements,nodes, vertices, loads, materials, parameters,process_units); break;
    51                 default: _error_("response descriptor \"" << response_descriptor << "\" not supported yet!"); break;
     61                default: _error_("response descriptor \"" << EnumToStringx(response_descriptor_enum) << "\" not supported yet!"); break;
    5262                #else
    5363                default: _error_("ISSM was not compiled with responses capabilities, exiting!");
  • issm/trunk-jpl/src/c/modules/Responsex/Responsex.h

    r12832 r13276  
    1010
    1111void 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);
     12void 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);
    1213
    1314#endif  /* _RESPONSESXX_H */
Note: See TracChangeset for help on using the changeset viewer.