Index: /issm/trunk/src/c/Container/DataSet.cpp =================================================================== --- /issm/trunk/src/c/Container/DataSet.cpp (revision 9882) +++ /issm/trunk/src/c/Container/DataSet.cpp (revision 9883) @@ -487,5 +487,5 @@ int DataSet::GetEnum(int offset){ - return objects[offset]->Enum(); + return objects[offset]->ObjectEnum(); } Index: /issm/trunk/src/c/Container/Inputs.cpp =================================================================== --- /issm/trunk/src/c/Container/Inputs.cpp (revision 9882) +++ /issm/trunk/src/c/Container/Inputs.cpp (revision 9883) @@ -54,5 +54,5 @@ input=(Input*)(*object); - if (input->EnumType()==enum_type){ + if (input->InstanceEnum()==enum_type){ found=true; break; @@ -82,5 +82,5 @@ input=(Input*)(*object); - if (input->EnumType()==enum_type){ + if (input->InstanceEnum()==enum_type){ found=true; break; @@ -110,5 +110,5 @@ input=(Input*)(*object); - if (input->EnumType()==enum_type){ + if (input->InstanceEnum()==enum_type){ found=true; break; @@ -138,5 +138,5 @@ input=(Input*)(*object); - if (input->EnumType()==enum_type){ + if (input->InstanceEnum()==enum_type){ found=true; break; @@ -171,5 +171,5 @@ input=(Input*)(*object); - if (input->EnumType()==in_input->EnumType()){ + if (input->InstanceEnum()==in_input->InstanceEnum()){ this->DeleteObject(input); break; @@ -193,5 +193,5 @@ input=(Input*)(*object); - if (input->EnumType()==newenumtype){ + if (input->InstanceEnum()==newenumtype){ this->DeleteObject(input); break; @@ -204,5 +204,5 @@ input=(Input*)(*object); - if (input->EnumType()==oldenumtype){ + if (input->InstanceEnum()==oldenumtype){ input->ChangeEnum(newenumtype); break; @@ -340,5 +340,5 @@ input=(Input*)(*object); - if (input->EnumType()==enum_name){ + if (input->InstanceEnum()==enum_name){ return input; } @@ -357,5 +357,5 @@ input=(Input*)(*object); - if (input->EnumType()==enum_type){ + if (input->InstanceEnum()==enum_type){ this->DeleteObject(input); break; Index: /issm/trunk/src/c/Container/Options.cpp =================================================================== --- /issm/trunk/src/c/Container/Options.cpp (revision 9882) +++ /issm/trunk/src/c/Container/Options.cpp (revision 9883) @@ -233,5 +233,5 @@ if(option){ /*If the object is a Cell, copy the strings from its options dataset*/ - if(option->Enum()==OptionCellEnum){ + if(option->ObjectEnum()==OptionCellEnum){ if (option->NumEl()) { *ppvalue=(char **) xmalloc(option->NumEl()*sizeof(char *)); @@ -240,5 +240,5 @@ for (i=0; iNumEl(); i++) { option2=((Option *)options->GetObjectByOffset(i)); - if(option2->Enum()==OptionCharEnum) + if(option2->ObjectEnum()==OptionCharEnum) option2->Get(&((*ppvalue)[i])); else @@ -248,10 +248,10 @@ } /*If the object is a Char, copy the strings from its concatenation*/ - else if(option->Enum()==OptionCharEnum){ + else if(option->ObjectEnum()==OptionCharEnum){ option->Get(ppvalue,numel); } /*Else: not supported*/ else{ - _error_("Cannot recover field \"%s\" for an option of type %s",name,EnumToStringx(option->Enum())); + _error_("Cannot recover field \"%s\" for an option of type %s",name,EnumToStringx(option->ObjectEnum())); } } @@ -301,9 +301,9 @@ else{ /*If the object is a Cell, recursive call to its options*/ - if(option->Enum()==OptionCellEnum){ + if(option->ObjectEnum()==OptionCellEnum){ return ((OptionCell*)option)->values->GetOption(name); } /*If the object is a Struct loop over its size and recursive call*/ - else if(option->Enum()==OptionStructEnum){ + else if(option->ObjectEnum()==OptionStructEnum){ for(int i=0;inumel;i++){ _assert_(((OptionStruct*)option)->values[i]); @@ -313,5 +313,5 @@ /*Else: not supported*/ else{ - _error_("Cannot recover field \"%s\" for an option of type %s",name,EnumToStringx(option->Enum())); + _error_("Cannot recover field \"%s\" for an option of type %s",name,EnumToStringx(option->ObjectEnum())); } } Index: /issm/trunk/src/c/Container/Parameters.cpp =================================================================== --- /issm/trunk/src/c/Container/Parameters.cpp (revision 9882) +++ /issm/trunk/src/c/Container/Parameters.cpp (revision 9883) @@ -51,5 +51,5 @@ for ( object=objects.begin() ; object < objects.end(); object++ ){ param=(Param*)(*object); - if(param->EnumType()==enum_type) return true; + if(param->InstanceEnum()==enum_type) return true; } return false; @@ -65,5 +65,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pbool); return; @@ -82,5 +82,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pinteger); return; @@ -99,5 +99,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pscalar); return; @@ -116,5 +116,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pstring); return; @@ -134,5 +134,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pstringarray,pM); return; @@ -152,5 +152,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pintarray,pM); return; @@ -170,5 +170,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pintarray,pM,pN); return; @@ -188,5 +188,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pdoublearray,pM); return; @@ -206,5 +206,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pdoublearray,pM,pN); return; @@ -224,5 +224,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(parray,pM,pmdims_array,pndims_array); return; @@ -241,5 +241,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pvec); return; @@ -259,5 +259,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pmat); return; @@ -277,5 +277,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ param->GetParameterValue(pfid); return; @@ -453,5 +453,5 @@ param=(Param*)(*object); - if(param->EnumType()==enum_type){ + if(param->InstanceEnum()==enum_type){ return (*object); } Index: /issm/trunk/src/c/Container/Results.cpp =================================================================== --- /issm/trunk/src/c/Container/Results.cpp (revision 9882) +++ /issm/trunk/src/c/Container/Results.cpp (revision 9883) @@ -103,5 +103,5 @@ for(i=0;iGetObjectByOffset(i); - enums[i]=result->EnumType(); + enums[i]=result->InstanceEnum(); } /*Now, make result types unique: */ Index: /issm/trunk/src/c/modules/ConstraintsStatex/ThermalConstraintsState.cpp =================================================================== --- /issm/trunk/src/c/modules/ConstraintsStatex/ThermalConstraintsState.cpp (revision 9882) +++ /issm/trunk/src/c/modules/ConstraintsStatex/ThermalConstraintsState.cpp (revision 9883) @@ -27,5 +27,5 @@ Load* load=(Load*)object; if(load->InAnalysis(configuration_type)){ - if(object->Enum()==PengridEnum){ + if(object->ObjectEnum()==PengridEnum){ Pengrid* pengrid=(Pengrid*)object; Index: /issm/trunk/src/c/modules/ConstraintsStatex/ThermalIsPresent.cpp =================================================================== --- /issm/trunk/src/c/modules/ConstraintsStatex/ThermalIsPresent.cpp (revision 9882) +++ /issm/trunk/src/c/modules/ConstraintsStatex/ThermalIsPresent.cpp (revision 9883) @@ -21,5 +21,5 @@ Load* load=(Load*)object; if(load->InAnalysis(configuration_type)){ - if (object->Enum()==PengridEnum){ + if (object->ObjectEnum()==PengridEnum){ found=1; break; Index: /issm/trunk/src/c/modules/ResetConstraintsx/ThermalConstraintsReset.cpp =================================================================== --- /issm/trunk/src/c/modules/ResetConstraintsx/ThermalConstraintsReset.cpp (revision 9882) +++ /issm/trunk/src/c/modules/ResetConstraintsx/ThermalConstraintsReset.cpp (revision 9883) @@ -20,5 +20,5 @@ Load* load=(Load*)object; if(load->InAnalysis(configuration_type)){ - if(object->Enum()==PengridEnum){ + if(object->ObjectEnum()==PengridEnum){ Pengrid* pengrid=(Pengrid*)object; Index: /issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp =================================================================== --- /issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp (revision 9882) +++ /issm/trunk/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp (revision 9883) @@ -26,5 +26,5 @@ /*Check this constraint belongs to this analysis: */ - if(constraint->InAnalysis(configuration_type) && constraint->Enum()==SpcDynamicEnum){ + if(constraint->InAnalysis(configuration_type) && constraint->ObjectEnum()==SpcDynamicEnum){ ((SpcDynamic*)constraint)->SetDynamicConstraint(nodes,yg_serial); Index: /issm/trunk/src/c/objects/Bamg/QuadTree.h =================================================================== --- /issm/trunk/src/c/objects/Bamg/QuadTree.h (revision 9882) +++ /issm/trunk/src/c/objects/Bamg/QuadTree.h (revision 9883) @@ -38,5 +38,5 @@ void Demarshall(char** pmarshalled_dataset){_error_("not implemented yet");}; #endif - int Enum(){_error_("not implemented yet");}; + int ObjectEnum(){_error_("not implemented yet");}; Object* copy(){_error_("not implemented yet");}; }; Index: /issm/trunk/src/c/objects/Constraints/SpcDynamic.cpp =================================================================== --- /issm/trunk/src/c/objects/Constraints/SpcDynamic.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Constraints/SpcDynamic.cpp (revision 9883) @@ -136,6 +136,6 @@ /*}}}1*/ #endif -/*FUNCTION SpcDynamic::Enum {{{1*/ -int SpcDynamic::Enum(void){ +/*FUNCTION SpcDynamic::ObjectEnum{{{1*/ +int SpcDynamic::ObjectEnum(void){ return SpcDynamicEnum; Index: /issm/trunk/src/c/objects/Constraints/SpcDynamic.h =================================================================== --- /issm/trunk/src/c/objects/Constraints/SpcDynamic.h (revision 9882) +++ /issm/trunk/src/c/objects/Constraints/SpcDynamic.h (revision 9883) @@ -39,5 +39,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/Constraints/SpcStatic.cpp =================================================================== --- /issm/trunk/src/c/objects/Constraints/SpcStatic.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Constraints/SpcStatic.cpp (revision 9883) @@ -136,6 +136,6 @@ /*}}}1*/ #endif -/*FUNCTION SpcStatic::Enum {{{1*/ -int SpcStatic::Enum(void){ +/*FUNCTION SpcStatic::ObjectEnum{{{1*/ +int SpcStatic::ObjectEnum(void){ return SpcStaticEnum; Index: /issm/trunk/src/c/objects/Constraints/SpcStatic.h =================================================================== --- /issm/trunk/src/c/objects/Constraints/SpcStatic.h (revision 9882) +++ /issm/trunk/src/c/objects/Constraints/SpcStatic.h (revision 9883) @@ -38,5 +38,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/Constraints/SpcTransient.cpp =================================================================== --- /issm/trunk/src/c/objects/Constraints/SpcTransient.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Constraints/SpcTransient.cpp (revision 9883) @@ -159,6 +159,6 @@ /*}}}1*/ #endif -/*FUNCTION SpcTransient::Enum {{{1*/ -int SpcTransient::Enum(void){ +/*FUNCTION SpcTransient::ObjectEnum{{{1*/ +int SpcTransient::ObjectEnum(void){ return SpcTransientEnum; Index: /issm/trunk/src/c/objects/Constraints/SpcTransient.h =================================================================== --- /issm/trunk/src/c/objects/Constraints/SpcTransient.h (revision 9882) +++ /issm/trunk/src/c/objects/Constraints/SpcTransient.h (revision 9883) @@ -40,5 +40,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/ElementResults/BoolElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/BoolElementResult.cpp (revision 9882) +++ /issm/trunk/src/c/objects/ElementResults/BoolElementResult.cpp (revision 9883) @@ -121,6 +121,6 @@ /*}}}*/ #endif -/*FUNCTION BoolElementResult::Enum{{{1*/ -int BoolElementResult::Enum(void){ +/*FUNCTION BoolElementResult::ObjectEnum{{{1*/ +int BoolElementResult::ObjectEnum(void){ return BoolElementResultEnum; @@ -137,6 +137,6 @@ /*ElementResult management*/ -/*FUNCTION BoolElementResult::EnumType{{{1*/ -int BoolElementResult::EnumType(void){ +/*FUNCTION BoolElementResult::InstanceEnum{{{1*/ +int BoolElementResult::InstanceEnum(void){ return this->enum_type; Index: /issm/trunk/src/c/objects/ElementResults/BoolElementResult.h =================================================================== --- /issm/trunk/src/c/objects/ElementResults/BoolElementResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ElementResults/BoolElementResult.h (revision 9883) @@ -40,5 +40,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ @@ -50,5 +50,5 @@ /*}}}*/ /*BoolElementResult management: {{{1*/ - int EnumType(); + int InstanceEnum(); void GetVectorFromResults(Vec vector,int* doflist,int numdofs); /*}}}*/ Index: /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 9882) +++ /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 9883) @@ -121,6 +121,6 @@ /*}}}*/ #endif -/*FUNCTION DoubleElementResult::Enum{{{1*/ -int DoubleElementResult::Enum(void){ +/*FUNCTION DoubleElementResult::ObjectEnum{{{1*/ +int DoubleElementResult::ObjectEnum(void){ return DoubleElementResultEnum; @@ -137,6 +137,6 @@ /*ElementResult management*/ -/*FUNCTION DoubleElementResult::EnumType{{{1*/ -int DoubleElementResult::EnumType(void){ +/*FUNCTION DoubleElementResult::InstanceEnum{{{1*/ +int DoubleElementResult::InstanceEnum(void){ return this->enum_type; Index: /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.h =================================================================== --- /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ElementResults/DoubleElementResult.h (revision 9883) @@ -40,5 +40,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ @@ -50,5 +50,5 @@ /*}}}*/ /*DoubleElementResult management: {{{1*/ - int EnumType(); + int InstanceEnum(); void GetVectorFromResults(Vec vector,int* doflist,int numdofs){_error_("not implemented");}; /*}}}*/ Index: /issm/trunk/src/c/objects/ElementResults/ElementResult.h =================================================================== --- /issm/trunk/src/c/objects/ElementResults/ElementResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ElementResults/ElementResult.h (revision 9883) @@ -22,5 +22,5 @@ virtual int NumberOfNodalValues(void)=0; virtual void PatchFill(int row, Patch* patch)=0; - virtual int EnumType()=0; + virtual int InstanceEnum()=0; virtual void GetVectorFromResults(Vec vector,int* doflist,int numdof)=0; Index: /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp (revision 9882) +++ /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.cpp (revision 9883) @@ -124,6 +124,6 @@ /*}}}*/ #endif -/*FUNCTION PentaVertexElementResult::Enum{{{1*/ -int PentaVertexElementResult::Enum(void){ +/*FUNCTION PentaVertexElementResult::ObjectEnum{{{1*/ +int PentaVertexElementResult::ObjectEnum(void){ return PentaVertexElementResultEnum; @@ -140,6 +140,6 @@ /*ElementResult management*/ -/*FUNCTION PentaVertexElementResult::EnumType{{{1*/ -int PentaVertexElementResult::EnumType(void){ +/*FUNCTION PentaVertexElementResult::InstanceEnum{{{1*/ +int PentaVertexElementResult::InstanceEnum(void){ return this->enum_type; Index: /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.h =================================================================== --- /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ElementResults/PentaVertexElementResult.h (revision 9883) @@ -39,5 +39,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ @@ -49,5 +49,5 @@ /*}}}*/ /*PentaVertexElementResult management: {{{1*/ - int EnumType(); + int InstanceEnum(); void GetVectorFromResults(Vec vector,int* doflist,int numdofs); /*}}}*/ Index: /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp (revision 9882) +++ /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.cpp (revision 9883) @@ -124,6 +124,6 @@ /*}}}*/ #endif -/*FUNCTION TriaVertexElementResult::Enum{{{1*/ -int TriaVertexElementResult::Enum(void){ +/*FUNCTION TriaVertexElementResult::ObjectEnum{{{1*/ +int TriaVertexElementResult::ObjectEnum(void){ return TriaVertexElementResultEnum; @@ -140,6 +140,6 @@ /*ElementResult management*/ -/*FUNCTION TriaVertexElementResult::EnumType{{{1*/ -int TriaVertexElementResult::EnumType(void){ +/*FUNCTION TriaVertexElementResult::InstanceEnum{{{1*/ +int TriaVertexElementResult::InstanceEnum(void){ return this->enum_type; Index: /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.h =================================================================== --- /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ElementResults/TriaVertexElementResult.h (revision 9883) @@ -38,5 +38,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ @@ -48,5 +48,5 @@ /*}}}*/ /*TriaVertexElementResult management: {{{1*/ - int EnumType(); + int InstanceEnum(); void GetVectorFromResults(Vec vector,int* doflist,int numdofs); /*}}}*/ Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 9883) @@ -772,6 +772,6 @@ } /*}}}*/ -/*FUNCTION Penta::Enum {{{1*/ -int Penta::Enum(void){ +/*FUNCTION Penta::ObjectEnum{{{1*/ +int Penta::ObjectEnum(void){ return PentaEnum; @@ -1137,5 +1137,5 @@ for(int i=0;iresults->Size();i++){ ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i); - if(elementresult->EnumType()!=result_enum) continue; + if(elementresult->InstanceEnum()!=result_enum) continue; elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES); return; @@ -1365,12 +1365,12 @@ /*If first time, initialize total_integrated_input*/ if (step==0){ - if (original_input->Enum()==PentaVertexInputEnum) + if (original_input->ObjectEnum()==PentaVertexInputEnum) total_integrated_input=new PentaVertexInput(average_enum_type,zeros_list); - else if (original_input->Enum()==ControlInputEnum) + else if (original_input->ObjectEnum()==ControlInputEnum) total_integrated_input=new PentaVertexInput(average_enum_type,zeros_list); - else if (original_input->Enum()==DoubleInputEnum) + else if (original_input->ObjectEnum()==DoubleInputEnum) total_integrated_input=new DoubleInput(average_enum_type,0.0); else - _error_("object %s not supported yet",EnumToStringx(original_input->Enum())); + _error_("object %s not supported yet",EnumToStringx(original_input->ObjectEnum())); } @@ -1514,5 +1514,5 @@ this->results->AddObject((Object*)input->SpawnResult(step,time)); #ifdef _HAVE_CONTROL_ - if(input->Enum()==ControlInputEnum) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time)); + if(input->ObjectEnum()==ControlInputEnum) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time)); #endif @@ -2045,5 +2045,5 @@ for(i=0;iresults->Size();i++){ ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i); - resultsenums[i]=elementresult->EnumType(); + resultsenums[i]=elementresult->InstanceEnum(); } } @@ -4045,5 +4045,5 @@ } if (!input) _error_("Input %s not found",EnumToStringx(enum_type)); - if (input->Enum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); + if (input->ObjectEnum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); this->GetDofList1(&doflist1[0]); @@ -4063,5 +4063,5 @@ } if (!input) _error_("Input %s not found",EnumToStringx(enum_type)); - if (input->Enum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); + if (input->ObjectEnum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); ((ControlInput*)input)->ScaleGradient(scale); @@ -4082,5 +4082,5 @@ } if (!input) _error_("Input %s not found",EnumToStringx(enum_type)); - if (input->Enum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); + if (input->ObjectEnum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); this->GetDofList1(&doflist1[0]); @@ -4492,5 +4492,5 @@ } - if (input->Enum()!=ControlInputEnum) _error_("input %s is not a ControlInput",EnumToStringx(control_type[i])); + if (input->ObjectEnum()!=ControlInputEnum) _error_("input %s is not a ControlInput",EnumToStringx(control_type[i])); ((ControlInput*)input)->UpdateValue(scalar); @@ -7143,5 +7143,5 @@ Input* vz_input=inputs->GetInput(VzEnum); if (vz_input){ - if (vz_input->Enum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as Vz is of type %s",EnumToStringx(vz_input->Enum())); + if (vz_input->ObjectEnum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as Vz is of type %s",EnumToStringx(vz_input->ObjectEnum())); vz_input->GetValuesPtr(&vz_ptr,&dummy); for(i=0;iGetInput(VzEnum); if (vz_input){ - if (vz_input->Enum()!=PentaVertexInputEnum){ - _error_("Cannot compute Vel as Vz is of type %s",EnumToStringx(vz_input->Enum())); + if (vz_input->ObjectEnum()!=PentaVertexInputEnum){ + _error_("Cannot compute Vel as Vz is of type %s",EnumToStringx(vz_input->ObjectEnum())); } vz_input->GetValuesPtr(&vz_ptr,&dummy); @@ -7332,6 +7332,6 @@ Input* vzmacayeal_input=inputs->GetInput(VzMacAyealEnum); if (vzmacayeal_input){ - if (vzmacayeal_input->Enum()!=PentaVertexInputEnum){ - _error_("Cannot compute Vel as VzMacAyeal is of type %s",EnumToStringx(vzmacayeal_input->Enum())); + if (vzmacayeal_input->ObjectEnum()!=PentaVertexInputEnum){ + _error_("Cannot compute Vel as VzMacAyeal is of type %s",EnumToStringx(vzmacayeal_input->ObjectEnum())); } vzmacayeal_input->GetValuesPtr(&vzmacayeal_ptr,&dummy); @@ -7495,6 +7495,6 @@ Input* vzpattyn_input=inputs->GetInput(VzPattynEnum); if (vzpattyn_input){ - if (vzpattyn_input->Enum()!=PentaVertexInputEnum){ - _error_("Cannot compute Vel as VzPattyn is of type %s",EnumToStringx(vzpattyn_input->Enum())); + if (vzpattyn_input->ObjectEnum()!=PentaVertexInputEnum){ + _error_("Cannot compute Vel as VzPattyn is of type %s",EnumToStringx(vzpattyn_input->ObjectEnum())); } vzpattyn_input->GetValuesPtr(&vzpattyn_ptr,&dummy); @@ -7571,6 +7571,6 @@ Input* vz_input=inputs->GetInput(VzEnum); if (vz_input){ - if (vz_input->Enum()!=PentaVertexInputEnum){ - _error_("Cannot compute Vel as Vz is of type %s",EnumToStringx(vz_input->Enum())); + if (vz_input->ObjectEnum()!=PentaVertexInputEnum){ + _error_("Cannot compute Vel as Vz is of type %s",EnumToStringx(vz_input->ObjectEnum())); } vz_input->GetValuesPtr(&vz_ptr,&dummy); @@ -7654,5 +7654,5 @@ Input* vx_input=inputs->GetInput(VxEnum); if (vx_input){ - if (vx_input->Enum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as Vx is of type %s",EnumToStringx(vx_input->Enum())); + if (vx_input->ObjectEnum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as Vx is of type %s",EnumToStringx(vx_input->ObjectEnum())); vx_input->GetValuesPtr(&vx_ptr,&dummy); for(i=0;iGetInput(VyEnum); if (vy_input){ - if (vy_input->Enum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as Vy is of type %s",EnumToStringx(vy_input->Enum())); + if (vy_input->ObjectEnum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as Vy is of type %s",EnumToStringx(vy_input->ObjectEnum())); vy_input->GetValuesPtr(&vy_ptr,&dummy); for(i=0;iGetInput(VzStokesEnum); if (vzstokes_input){ - if (vzstokes_input->Enum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as VzStokes is of type %s",EnumToStringx(vy_input->Enum())); + if (vzstokes_input->ObjectEnum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as VzStokes is of type %s",EnumToStringx(vy_input->ObjectEnum())); vzstokes_input->GetValuesPtr(&vzstokes_ptr,&dummy); for(i=0;iGetInput(VzStokesEnum); if (vzstokes_input){ - if (vzstokes_input->Enum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as VzStokes is of type %s",EnumToStringx(vy_input->Enum())); + if (vzstokes_input->ObjectEnum()!=PentaVertexInputEnum) _error_("Cannot compute Vel as VzStokes is of type %s",EnumToStringx(vy_input->ObjectEnum())); vzstokes_input->GetValuesPtr(&vzstokes_ptr,&dummy); for(i=0;iGetInput(SurfaceEnum); _assert_(surface_input); Input* bed_input =inputs->GetInput(BedEnum); _assert_(bed_input); - if((surface_input->Enum()!=TriaVertexInputEnum) | (bed_input->Enum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); + if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); GetParameterListOnVertices(&h[0],ThicknessEnum); @@ -1059,6 +1059,6 @@ } /*}}}*/ -/*FUNCTION Tria::Enum {{{1*/ -int Tria::Enum(void){ +/*FUNCTION Tria::ObjectEnum{{{1*/ +int Tria::ObjectEnum(void){ return TriaEnum; @@ -1319,5 +1319,5 @@ for(int i=0;iresults->Size();i++){ ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i); - if(elementresult->EnumType()!=result_enum) continue; + if(elementresult->InstanceEnum()!=result_enum) continue; elementresult->GetVectorFromResults(vector,&doflist1[0],NUMVERTICES); return; @@ -1449,5 +1449,5 @@ this->results->AddObject((Object*)input->SpawnResult(step,time)); #ifdef _HAVE_CONTROL_ - if(input->Enum()==ControlInputEnum) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time)); + if(input->ObjectEnum()==ControlInputEnum) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time)); #endif } @@ -1971,5 +1971,5 @@ for(i=0;iresults->Size();i++){ ElementResult* elementresult=(ElementResult*)this->results->GetObjectByOffset(i); - resultsenums[i]=elementresult->EnumType(); + resultsenums[i]=elementresult->InstanceEnum(); } } @@ -1996,5 +1996,5 @@ Input* surface_input =inputs->GetInput(SurfaceEnum); _assert_(surface_input); Input* bed_input =inputs->GetInput(BedEnum); _assert_(bed_input); - if((surface_input->Enum()!=TriaVertexInputEnum) | (bed_input->Enum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); + if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); GetParameterListOnVertices(&h[0],ThicknessEnum); @@ -2126,5 +2126,5 @@ Input* surface_input =inputs->GetInput(SurfaceEnum); _assert_(surface_input); Input* bed_input =inputs->GetInput(BedEnum); _assert_(bed_input); - if((surface_input->Enum()!=TriaVertexInputEnum) | (bed_input->Enum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); + if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); GetParameterListOnVertices(&h[0],ThicknessEnum); @@ -2227,5 +2227,5 @@ Input* surface_input =inputs->GetInput(SurfaceEnum); _assert_(surface_input); Input* bed_input =inputs->GetInput(BedEnum); _assert_(bed_input); - if((surface_input->Enum()!=TriaVertexInputEnum) | (bed_input->Enum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); + if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); GetParameterListOnVertices(&h[0],ThicknessEnum); @@ -2288,5 +2288,5 @@ Input* surface_input =inputs->GetInput(SurfaceEnum); _assert_(surface_input); Input* bed_input =inputs->GetInput(BedEnum); _assert_(bed_input); - if((surface_input->Enum()!=TriaVertexInputEnum) | (bed_input->Enum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); + if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); GetParameterListOnVertices(&h[0],ThicknessEnum); @@ -2565,5 +2565,5 @@ surface_input =inputs->GetInput(SurfaceEnum); _assert_(surface_input); bed_input =inputs->GetInput(BedEnum); _assert_(bed_input); - if((surface_input->Enum()!=TriaVertexInputEnum) | (bed_input->Enum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); + if((surface_input->ObjectEnum()!=TriaVertexInputEnum) | (bed_input->ObjectEnum()!=TriaVertexInputEnum))_error_(" not supported yet for bed and surface interpolations not P1!"); GetParameterListOnVertices(&h[0],ThicknessEnum); @@ -3377,6 +3377,6 @@ vz_input=inputs->GetInput(VzEnum); if (vz_input){ - if (vz_input->Enum()!=TriaVertexInputEnum){ - _error_("Cannot compute Vel as Vz is of type %s",EnumToStringx(vz_input->Enum())); + if (vz_input->ObjectEnum()!=TriaVertexInputEnum){ + _error_("Cannot compute Vel as Vz is of type %s",EnumToStringx(vz_input->ObjectEnum())); } vz_input->GetValuesPtr(&vz_ptr,&dummy); @@ -3438,5 +3438,5 @@ } - if (input->Enum()!=ControlInputEnum){ + if (input->ObjectEnum()!=ControlInputEnum){ _error_("input %s is not a ControlInput",EnumToStringx(control_type[i])); } @@ -3465,5 +3465,5 @@ } if (!input) _error_("Input %s not found",EnumToStringx(enum_type)); - if (input->Enum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); + if (input->ObjectEnum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); this->GetDofList1(&doflist1[0]); @@ -3483,5 +3483,5 @@ } if (!input) _error_("Input %s not found",EnumToStringx(enum_type)); - if (input->Enum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); + if (input->ObjectEnum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); ((ControlInput*)input)->ScaleGradient(scale); @@ -3502,5 +3502,5 @@ } if (!input) _error_("Input %s not found",EnumToStringx(enum_type)); - if (input->Enum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); + if (input->ObjectEnum()!=ControlInputEnum) _error_("Input %s is not a ControlInput",EnumToStringx(enum_type)); this->GetDofList1(&doflist1[0]); Index: /issm/trunk/src/c/objects/Elements/Tria.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.h (revision 9882) +++ /issm/trunk/src/c/objects/Elements/Tria.h (revision 9883) @@ -56,5 +56,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 9883) @@ -128,6 +128,6 @@ /*}}}*/ #endif -/*FUNCTION BoolExternalResult::Enum{{{1*/ -int BoolExternalResult::Enum(void){ +/*FUNCTION BoolExternalResult::ObjectEnum{{{1*/ +int BoolExternalResult::ObjectEnum(void){ return BoolExternalResultEnum; Index: /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/BoolExternalResult.h (revision 9883) @@ -52,9 +52,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*ExternalResult management: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); char* GetResultName(void); Index: /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 9883) @@ -128,6 +128,6 @@ /*}}}*/ #endif -/*FUNCTION DoubleExternalResult::Enum{{{1*/ -int DoubleExternalResult::Enum(void){ +/*FUNCTION DoubleExternalResult::ObjectEnum{{{1*/ +int DoubleExternalResult::ObjectEnum(void){ return DoubleExternalResultEnum; Index: /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleExternalResult.h (revision 9883) @@ -53,9 +53,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*ExternalResult management: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); char* GetResultName(void); Index: /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 9883) @@ -165,6 +165,6 @@ /*}}}*/ #endif -/*FUNCTION DoubleMatExternalResult::Enum{{{1*/ -int DoubleMatExternalResult::Enum(void){ +/*FUNCTION DoubleMatExternalResult::ObjectEnum{{{1*/ +int DoubleMatExternalResult::ObjectEnum(void){ return DoubleMatExternalResultEnum; Index: /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleMatExternalResult.h (revision 9883) @@ -54,9 +54,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*ExternalResult managemnet: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); char* GetResultName(void); Index: /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 9883) @@ -153,6 +153,6 @@ /*}}}*/ #endif -/*FUNCTION DoubleVecExternalResult::Enum{{{1*/ -int DoubleVecExternalResult::Enum(void){ +/*FUNCTION DoubleVecExternalResult::ObjectEnum{{{1*/ +int DoubleVecExternalResult::ObjectEnum(void){ return DoubleVecExternalResultEnum; Index: /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/DoubleVecExternalResult.h (revision 9883) @@ -53,9 +53,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*ExternalResult management: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); char* GetResultName(void); Index: /issm/trunk/src/c/objects/ExternalResults/ExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/ExternalResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/ExternalResult.h (revision 9883) @@ -30,5 +30,5 @@ virtual ~ExternalResult(){}; /*Virtual functions:{{{1*/ - virtual int EnumType()=0; + virtual int InstanceEnum()=0; virtual void WriteData(FILE* fid,bool io_gather)=0; virtual char* GetResultName(void)=0; Index: /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 9883) @@ -128,6 +128,6 @@ /*}}}*/ #endif -/*FUNCTION IntExternalResult::Enum{{{1*/ -int IntExternalResult::Enum(void){ +/*FUNCTION IntExternalResult::ObjectEnum{{{1*/ +int IntExternalResult::ObjectEnum(void){ return IntExternalResultEnum; Index: /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/IntExternalResult.h (revision 9883) @@ -51,9 +51,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*ExternalResult managemnet: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); char* GetResultName(void); Index: /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 9883) @@ -184,6 +184,6 @@ /*}}}*/ #endif -/*FUNCTION PetscVecExternalResult::Enum{{{1*/ -int PetscVecExternalResult::Enum(void){ +/*FUNCTION PetscVecExternalResult::ObjectEnum{{{1*/ +int PetscVecExternalResult::ObjectEnum(void){ return PetscVecExternalResultEnum; Index: /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/PetscVecExternalResult.h (revision 9883) @@ -53,9 +53,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*ExternalResult management: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); char* GetResultName(void); Index: /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 9883) @@ -144,6 +144,6 @@ /*}}}*/ #endif -/*FUNCTION StringExternalResult::Enum{{{1*/ -int StringExternalResult::Enum(void){ +/*FUNCTION StringExternalResult::ObjectEnum{{{1*/ +int StringExternalResult::ObjectEnum(void){ return StringExternalResultEnum; Index: /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.h =================================================================== --- /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.h (revision 9882) +++ /issm/trunk/src/c/objects/ExternalResults/StringExternalResult.h (revision 9883) @@ -51,9 +51,9 @@ int MarshallSize(); void Demarshall(char** pmarshalled_dataset); - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*ExternalResult management: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); char* GetResultName(void); Index: /issm/trunk/src/c/objects/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/BoolInput.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/BoolInput.cpp (revision 9883) @@ -110,6 +110,6 @@ /*}}}*/ #endif -/*FUNCTION BoolInput::Enum{{{1*/ -int BoolInput::Enum(void){ +/*FUNCTION BoolInput::ObjectEnum{{{1*/ +int BoolInput::ObjectEnum(void){ return BoolInputEnum; @@ -126,6 +126,6 @@ /*BoolInput management*/ -/*FUNCTION BoolInput::EnumType{{{1*/ -int BoolInput::EnumType(void){ +/*FUNCTION BoolInput::InstanceEnum{{{1*/ +int BoolInput::InstanceEnum(void){ return this->enum_type; @@ -205,5 +205,5 @@ /*Carry out the AXPY operation depending on type:*/ - switch(xinput->Enum()){ + switch(xinput->ObjectEnum()){ case BoolInputEnum: Index: /issm/trunk/src/c/objects/Inputs/BoolInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/BoolInput.h (revision 9883) @@ -36,9 +36,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*BoolInput management: {{{1*/ - int EnumType(); + int InstanceEnum(); Input* SpawnTriaInput(int* indices); Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; Index: /issm/trunk/src/c/objects/Inputs/ControlInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/ControlInput.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/ControlInput.cpp (revision 9883) @@ -298,6 +298,6 @@ /*}}}*/ #endif -/*FUNCTION ControlInput::Enum{{{1*/ -int ControlInput::Enum(void){ +/*FUNCTION ControlInput::ObjectEnum{{{1*/ +int ControlInput::ObjectEnum(void){ return ControlInputEnum; @@ -325,6 +325,6 @@ /*ControlInput management*/ -/*FUNCTION ControlInput::EnumType{{{1*/ -int ControlInput::EnumType(void){ +/*FUNCTION ControlInput::InstanceEnum{{{1*/ +int ControlInput::InstanceEnum(void){ return this->enum_type; Index: /issm/trunk/src/c/objects/Inputs/ControlInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/ControlInput.h (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/ControlInput.h (revision 9883) @@ -40,9 +40,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*ControlInput management: {{{1*/ - int EnumType(); + int InstanceEnum(); Input* SpawnTriaInput(int* indices); Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; Index: /issm/trunk/src/c/objects/Inputs/DatasetInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/DatasetInput.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/DatasetInput.cpp (revision 9883) @@ -125,6 +125,6 @@ /*}}}*/ #endif -/*FUNCTION DatasetInput::Enum{{{1*/ -int DatasetInput::Enum(void){ +/*FUNCTION DatasetInput::ObjectEnum{{{1*/ +int DatasetInput::ObjectEnum(void){ return DatasetInputEnum; @@ -161,6 +161,6 @@ /*DatasetInput management*/ -/*FUNCTION DatasetInput::EnumType{{{1*/ -int DatasetInput::EnumType(void){ +/*FUNCTION DatasetInput::InstanceEnum{{{1*/ +int DatasetInput::InstanceEnum(void){ return this->enum_type; Index: /issm/trunk/src/c/objects/Inputs/DatasetInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/DatasetInput.h (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/DatasetInput.h (revision 9883) @@ -36,9 +36,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*DatasetInput management: {{{1*/ - int EnumType(); + int InstanceEnum(); Input* SpawnTriaInput(int* indices); Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; Index: /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/DoubleInput.cpp (revision 9883) @@ -110,6 +110,6 @@ /*}}}*/ #endif -/*FUNCTION DoubleInput::Enum{{{1*/ -int DoubleInput::Enum(void){ +/*FUNCTION DoubleInput::ObjectEnum{{{1*/ +int DoubleInput::ObjectEnum(void){ return DoubleInputEnum; @@ -126,6 +126,6 @@ /*DoubleInput management*/ -/*FUNCTION DoubleInput::EnumType{{{1*/ -int DoubleInput::EnumType(void){ +/*FUNCTION DoubleInput::InstanceEnum{{{1*/ +int DoubleInput::InstanceEnum(void){ return this->enum_type; @@ -269,5 +269,5 @@ /*Carry out the AXPY operation depending on type:*/ - switch(xinput->Enum()){ + switch(xinput->ObjectEnum()){ case DoubleInputEnum: @@ -335,8 +335,8 @@ /*Check that input provided is a thickness*/ - if (thickness_input->EnumType()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is %s)",EnumToStringx(thickness_input->EnumType())); + if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is %s)",EnumToStringx(thickness_input->InstanceEnum())); /*vertically integrate depending on type:*/ - switch(thickness_input->Enum()){ + switch(thickness_input->ObjectEnum()){ case PentaVertexInputEnum: Index: /issm/trunk/src/c/objects/Inputs/DoubleInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/DoubleInput.h (revision 9883) @@ -35,9 +35,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*DoubleInput management: {{{1*/ - int EnumType(); + int InstanceEnum(); Input* SpawnTriaInput(int* indices); Input* PointwiseDivide(Input* inputB); Index: /issm/trunk/src/c/objects/Inputs/Input.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/Input.h (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/Input.h (revision 9883) @@ -22,5 +22,5 @@ virtual ~Input(){}; /*Virtual functions:{{{1*/ - virtual int EnumType()=0; + virtual int InstanceEnum()=0; virtual void GetParameterValue(bool* pvalue)=0; virtual void GetParameterValue(int* pvalue)=0; Index: /issm/trunk/src/c/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/IntInput.cpp (revision 9883) @@ -105,6 +105,6 @@ /*}}}*/ #endif -/*FUNCTION IntInput::Enum{{{1*/ -int IntInput::Enum(void){ +/*FUNCTION IntInput::ObjectEnum{{{1*/ +int IntInput::ObjectEnum(void){ return IntInputEnum; @@ -126,6 +126,6 @@ } /*}}}*/ -/*FUNCTION IntInput::EnumType{{{1*/ -int IntInput::EnumType(void){ +/*FUNCTION IntInput::InstanceEnum{{{1*/ +int IntInput::InstanceEnum(void){ return this->enum_type; @@ -209,5 +209,5 @@ /*Carry out the AXPY operation depending on type:*/ - switch(xinput->Enum()){ + switch(xinput->ObjectEnum()){ case IntInputEnum: Index: /issm/trunk/src/c/objects/Inputs/IntInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/IntInput.h (revision 9883) @@ -36,9 +36,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*IntInput management: {{{1*/ - int EnumType(); + int InstanceEnum(); Input* SpawnTriaInput(int* indices); Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp (revision 9883) @@ -121,6 +121,6 @@ /*}}}*/ #endif -/*FUNCTION PentaVertexInput::Enum{{{1*/ -int PentaVertexInput::Enum(void){ +/*FUNCTION PentaVertexInput::ObjectEnum{{{1*/ +int PentaVertexInput::ObjectEnum(void){ return PentaVertexInputEnum; @@ -137,6 +137,6 @@ } /*}}}*/ -/*FUNCTION PentaVertexInput::EnumType{{{1*/ -int PentaVertexInput::EnumType(void){ +/*FUNCTION PentaVertexInput::InstanceEnum{{{1*/ +int PentaVertexInput::InstanceEnum(void){ return this->enum_type; @@ -498,5 +498,5 @@ /*Carry out the AXPY operation depending on type:*/ - switch(xinput->Enum()){ + switch(xinput->ObjectEnum()){ case PentaVertexInputEnum:{ @@ -506,5 +506,5 @@ case ControlInputEnum:{ ControlInput* cont_input=(ControlInput*)xinput; - if(cont_input->values->Enum()!=PentaVertexInputEnum) _error_("not supported yet"); + if(cont_input->values->ObjectEnum()!=PentaVertexInputEnum) _error_("not supported yet"); PentaVertexInput* cast_input=(PentaVertexInput*)cont_input->values; for(i=0;ivalues[i]=this->values[i]+scalar*(cast_input->values[i]);} @@ -547,5 +547,5 @@ /*Check that input provided is a thickness*/ - if (thickness_input->EnumType()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is %s)",EnumToStringx(thickness_input->EnumType())); + if (thickness_input->InstanceEnum()!=ThicknessEnum) _error_("Input provided is not a Thickness (enum_type is %s)",EnumToStringx(thickness_input->InstanceEnum())); /*Get Thickness value pointer*/ @@ -553,5 +553,5 @@ /*vertically integrate depending on type:*/ - switch(thickness_input->Enum()){ + switch(thickness_input->ObjectEnum()){ case PentaVertexInputEnum: @@ -581,5 +581,5 @@ /*Check that inputB is of the same type*/ - if (inputB->Enum()!=PentaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->Enum())); + if (inputB->ObjectEnum()!=PentaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); xinputB=(PentaVertexInput*)inputB; @@ -612,5 +612,5 @@ /*Check that inputB is of the same type*/ - if (inputB->Enum()!=PentaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->Enum())); + if (inputB->ObjectEnum()!=PentaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); xinputB=(PentaVertexInput*)inputB; @@ -643,5 +643,5 @@ /*Check that inputB is of the same type*/ - if (inputB->Enum()!=PentaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->Enum())); + if (inputB->ObjectEnum()!=PentaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); xinputB=(PentaVertexInput*)inputB; Index: /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/PentaVertexInput.h (revision 9883) @@ -36,9 +36,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*PentaVertexInput management: {{{1*/ - int EnumType(); + int InstanceEnum(); Input* SpawnTriaInput(int* indices); Input* PointwiseDivide(Input* inputB); Index: /issm/trunk/src/c/objects/Inputs/TransientInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/TransientInput.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/TransientInput.cpp (revision 9883) @@ -187,6 +187,6 @@ /*}}}*/ #endif -/*FUNCTION TransientInput::Enum{{{1*/ -int TransientInput::Enum(void){ +/*FUNCTION TransientInput::ObjectEnum{{{1*/ +int TransientInput::ObjectEnum(void){ return TransientInputEnum; @@ -213,6 +213,6 @@ /*TransientInput management*/ -/*FUNCTION TransientInput::EnumType{{{1*/ -int TransientInput::EnumType(void){ +/*FUNCTION TransientInput::InstanceEnum{{{1*/ +int TransientInput::InstanceEnum(void){ return this->enum_type; Index: /issm/trunk/src/c/objects/Inputs/TransientInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/TransientInput.h (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/TransientInput.h (revision 9883) @@ -39,9 +39,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*TransientInput management: {{{1*/ - int EnumType(); + int InstanceEnum(); Input* SpawnTriaInput(int* indices); Input* PointwiseDivide(Input* forcingB){_error_("not implemented yet");}; Index: /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp =================================================================== --- /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp (revision 9883) @@ -121,6 +121,6 @@ /*}}}*/ #endif -/*FUNCTION TriaVertexInput::Enum{{{1*/ -int TriaVertexInput::Enum(void){ +/*FUNCTION TriaVertexInput::ObjectEnum{{{1*/ +int TriaVertexInput::ObjectEnum(void){ return TriaVertexInputEnum; @@ -137,6 +137,6 @@ /*TriaVertexInput management*/ -/*FUNCTION TriaVertexInput::EnumType{{{1*/ -int TriaVertexInput::EnumType(void){ +/*FUNCTION TriaVertexInput::InstanceEnum{{{1*/ +int TriaVertexInput::InstanceEnum(void){ return this->enum_type; @@ -367,5 +367,5 @@ /*Carry out the AXPY operation depending on type:*/ - switch(xinput->Enum()){ + switch(xinput->ObjectEnum()){ case TriaVertexInputEnum : @@ -419,5 +419,5 @@ /*Check that inputB is of the same type*/ - if (inputB->Enum()!=TriaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->Enum())); + if (inputB->ObjectEnum()!=TriaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); xinputB=(TriaVertexInput*)inputB; @@ -450,5 +450,5 @@ /*Check that inputB is of the same type*/ - if (inputB->Enum()!=TriaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->Enum())); + if (inputB->ObjectEnum()!=TriaVertexInputEnum) _error_("Operation not permitted because inputB is of type %s",EnumToStringx(inputB->ObjectEnum())); xinputB=(TriaVertexInput*)inputB; Index: /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h =================================================================== --- /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 9882) +++ /issm/trunk/src/c/objects/Inputs/TriaVertexInput.h (revision 9883) @@ -36,9 +36,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*TriaVertexInput management: {{{1*/ - int EnumType(); + int InstanceEnum(); Input* SpawnTriaInput(int* indices); Input* PointwiseDivide(Input* inputB){_error_("not implemented yet");}; Index: /issm/trunk/src/c/objects/KML/KML_Attribute.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Attribute.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Attribute.h (revision 9883) @@ -35,5 +35,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_ColorStyle.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_ColorStyle.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_ColorStyle.h (revision 9883) @@ -40,5 +40,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Container.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Container.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Container.h (revision 9883) @@ -38,5 +38,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Document.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Document.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Document.h (revision 9883) @@ -35,5 +35,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Feature.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Feature.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Feature.h (revision 9883) @@ -49,5 +49,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_File.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_File.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_File.h (revision 9883) @@ -38,5 +38,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Folder.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Folder.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Folder.h (revision 9883) @@ -35,5 +35,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Geometry.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Geometry.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Geometry.h (revision 9883) @@ -34,5 +34,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_GroundOverlay.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_GroundOverlay.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_GroundOverlay.h (revision 9883) @@ -41,5 +41,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Icon.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Icon.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Icon.h (revision 9883) @@ -49,5 +49,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_LatLonBox.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_LatLonBox.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_LatLonBox.h (revision 9883) @@ -40,5 +40,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_LineString.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_LineString.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_LineString.h (revision 9883) @@ -43,5 +43,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_LineStyle.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_LineStyle.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_LineStyle.h (revision 9883) @@ -36,5 +36,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_LinearRing.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_LinearRing.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_LinearRing.h (revision 9883) @@ -43,5 +43,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_MultiGeometry.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_MultiGeometry.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_MultiGeometry.h (revision 9883) @@ -39,5 +39,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Object.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Object.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Object.h (revision 9883) @@ -34,5 +34,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Overlay.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Overlay.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Overlay.h (revision 9883) @@ -41,5 +41,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Placemark.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Placemark.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Placemark.h (revision 9883) @@ -39,5 +39,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_PolyStyle.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_PolyStyle.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_PolyStyle.h (revision 9883) @@ -37,5 +37,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Polygon.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Polygon.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Polygon.h (revision 9883) @@ -45,5 +45,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_Style.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Style.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_Style.h (revision 9883) @@ -43,5 +43,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_StyleSelector.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_StyleSelector.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_StyleSelector.h (revision 9883) @@ -34,5 +34,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/KML/KML_SubStyle.h =================================================================== --- /issm/trunk/src/c/objects/KML/KML_SubStyle.h (revision 9882) +++ /issm/trunk/src/c/objects/KML/KML_SubStyle.h (revision 9883) @@ -34,5 +34,5 @@ int MarshallSize(){_error_("Not implemented yet.");}; void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet.");}; - int Enum(){_error_("Not implemented yet.");}; + int ObjectEnum(){_error_("Not implemented yet.");}; Object* copy(){_error_("Not implemented yet.");}; /*}}}*/ Index: /issm/trunk/src/c/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Icefront.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Loads/Icefront.cpp (revision 9883) @@ -251,6 +251,6 @@ /*}}}*/ #endif -/*FUNCTION Icefront::Enum {{{1*/ -int Icefront::Enum(void){ +/*FUNCTION Icefront::ObjectEnum{{{1*/ +int Icefront::ObjectEnum(void){ return IcefrontEnum; Index: /issm/trunk/src/c/objects/Loads/Icefront.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Icefront.h (revision 9882) +++ /issm/trunk/src/c/objects/Loads/Icefront.h (revision 9883) @@ -54,5 +54,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/Loads/Numericalflux.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Numericalflux.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Loads/Numericalflux.cpp (revision 9883) @@ -272,6 +272,6 @@ /*}}}*/ #endif -/*FUNCTION Numericalflux::Enum {{{1*/ -int Numericalflux::Enum(void){ +/*FUNCTION Numericalflux::ObjectEnum{{{1*/ +int Numericalflux::ObjectEnum(void){ return NumericalfluxEnum; Index: /issm/trunk/src/c/objects/Loads/Numericalflux.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Numericalflux.h (revision 9882) +++ /issm/trunk/src/c/objects/Loads/Numericalflux.h (revision 9883) @@ -50,5 +50,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/Loads/Pengrid.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Loads/Pengrid.cpp (revision 9883) @@ -226,6 +226,6 @@ /*}}}*/ #endif -/*FUNCTION Pengrid::Enum {{{1*/ -int Pengrid::Enum(void){ +/*FUNCTION Pengrid::ObjectEnum{{{1*/ +int Pengrid::ObjectEnum(void){ return PengridEnum; Index: /issm/trunk/src/c/objects/Loads/Pengrid.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Pengrid.h (revision 9882) +++ /issm/trunk/src/c/objects/Loads/Pengrid.h (revision 9883) @@ -55,5 +55,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/Loads/Penpair.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Penpair.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Loads/Penpair.cpp (revision 9883) @@ -148,6 +148,6 @@ /*}}}1*/ #endif -/*FUNCTION Penpair::Enum {{{1*/ -int Penpair::Enum(void){ +/*FUNCTION Penpair::ObjectEnum{{{1*/ +int Penpair::ObjectEnum(void){ return PenpairEnum; Index: /issm/trunk/src/c/objects/Loads/Penpair.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Penpair.h (revision 9882) +++ /issm/trunk/src/c/objects/Loads/Penpair.h (revision 9883) @@ -42,5 +42,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Riftfront.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Loads/Riftfront.cpp (revision 9883) @@ -311,6 +311,6 @@ /*}}}*/ #endif -/*FUNCTION Riftfront::Enum {{{1*/ -int Riftfront::Enum(void){ +/*FUNCTION Riftfront::ObjectEnum{{{1*/ +int Riftfront::ObjectEnum(void){ return RiftfrontEnum; @@ -516,5 +516,5 @@ /*enum of element? */ - if(elements[0]->Enum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); + if(elements[0]->ObjectEnum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); tria1=(Tria*)elements[0]; tria2=(Tria*)elements[1]; @@ -607,5 +607,5 @@ /*enum of element? */ - if(elements[0]->Enum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); + if(elements[0]->ObjectEnum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); tria1=(Tria*)elements[0]; tria2=(Tria*)elements[1]; @@ -704,5 +704,5 @@ /*enum of element? */ - if(elements[0]->Enum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); + if(elements[0]->ObjectEnum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); /*recover elements on both side of rift: */ @@ -824,5 +824,5 @@ /*enum of element? */ - if(elements[0]->Enum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); + if(elements[0]->ObjectEnum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); /*recover elements on both side of rift: */ @@ -869,5 +869,5 @@ /*enum of element? */ - if(elements[0]->Enum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); + if(elements[0]->ObjectEnum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); /*recover elements on both side of rift: */ @@ -912,5 +912,5 @@ /*enum of element? */ - if(elements[0]->Enum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); + if(elements[0]->ObjectEnum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); /*recover elements on both side of rift: */ @@ -961,5 +961,5 @@ /*enum of element? */ - if(elements[0]->Enum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); + if(elements[0]->ObjectEnum()!=TriaEnum)_error_(" only Tria element allowed for Riftfront load!"); /*recover elements on both side of rift: */ Index: /issm/trunk/src/c/objects/Loads/Riftfront.h =================================================================== --- /issm/trunk/src/c/objects/Loads/Riftfront.h (revision 9882) +++ /issm/trunk/src/c/objects/Loads/Riftfront.h (revision 9883) @@ -62,5 +62,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 9883) @@ -158,6 +158,6 @@ /*}}}*/ #endif -/*FUNCTION Matice::Enum {{{1*/ -int Matice::Enum(void){ +/*FUNCTION Matice::ObjectEnum{{{1*/ +int Matice::ObjectEnum(void){ return MaticeEnum; @@ -240,5 +240,5 @@ if (!IsInput(input_enum)) return; - switch(element->Enum()){ + switch(element->ObjectEnum()){ case TriaEnum:{ @@ -256,5 +256,5 @@ break; - default: _error_("element %s not implemented yet",EnumToStringx(element->Enum())); + default: _error_("element %s not implemented yet",EnumToStringx(element->ObjectEnum())); } } @@ -547,5 +547,5 @@ case VertexEnum: - switch(element->Enum()){ + switch(element->ObjectEnum()){ case TriaEnum: @@ -555,5 +555,5 @@ return; - default: _error_("element %s not implemented yet",EnumToStringx(element->Enum())); + default: _error_("element %s not implemented yet",EnumToStringx(element->ObjectEnum())); } default: _error_("type %i (%s) not implemented yet",type,EnumToStringx(type)); @@ -589,5 +589,5 @@ case VertexEnum: - switch(element->Enum()){ + switch(element->ObjectEnum()){ case TriaEnum: @@ -598,5 +598,5 @@ if(name==MaterialsRheologyBEnum){ /*Are we in 2D?:*/ - if(element->Enum()==TriaEnum){ + if(element->ObjectEnum()==TriaEnum){ parameters=((Tria*)(element))->parameters; } @@ -613,5 +613,5 @@ return; - default: _error_("element %s not implemented yet",EnumToStringx(element->Enum())); + default: _error_("element %s not implemented yet",EnumToStringx(element->ObjectEnum())); } default: _error_("type %i (%s) not implemented yet",type,EnumToStringx(type)); Index: /issm/trunk/src/c/objects/Materials/Matice.h =================================================================== --- /issm/trunk/src/c/objects/Materials/Matice.h (revision 9882) +++ /issm/trunk/src/c/objects/Materials/Matice.h (revision 9883) @@ -40,5 +40,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Materials/Matpar.cpp (revision 9883) @@ -181,6 +181,6 @@ /*}}}1*/ #endif -/*FUNCTION Matpar::Enum {{{1*/ -int Matpar::Enum(void){ +/*FUNCTION Matpar::ObjectEnum{{{1*/ +int Matpar::ObjectEnum(void){ return MatparEnum; Index: /issm/trunk/src/c/objects/Materials/Matpar.h =================================================================== --- /issm/trunk/src/c/objects/Materials/Matpar.h (revision 9882) +++ /issm/trunk/src/c/objects/Materials/Matpar.h (revision 9883) @@ -50,5 +50,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/Node.cpp =================================================================== --- /issm/trunk/src/c/objects/Node.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Node.cpp (revision 9883) @@ -263,6 +263,6 @@ /*}}}*/ #endif -/*FUNCTION Node::Enum{{{1*/ -int Node::Enum(void){ +/*FUNCTION Node::ObjectEnum{{{1*/ +int Node::ObjectEnum(void){ return NodeEnum; Index: /issm/trunk/src/c/objects/Node.h =================================================================== --- /issm/trunk/src/c/objects/Node.h (revision 9882) +++ /issm/trunk/src/c/objects/Node.h (revision 9883) @@ -47,5 +47,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(){_error_("Not implemented yet (similar to Elements)");}; /*}}}*/ Index: /issm/trunk/src/c/objects/Object.h =================================================================== --- /issm/trunk/src/c/objects/Object.h (revision 9882) +++ /issm/trunk/src/c/objects/Object.h (revision 9883) @@ -26,5 +26,5 @@ virtual void Demarshall(char** pmarshalled_dataset)=0; #endif - virtual int Enum()=0; + virtual int ObjectEnum()=0; virtual Object* copy()=0; Index: /issm/trunk/src/c/objects/Options/Option.h =================================================================== --- /issm/trunk/src/c/objects/Options/Option.h (revision 9882) +++ /issm/trunk/src/c/objects/Options/Option.h (revision 9883) @@ -38,5 +38,5 @@ void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; #endif - int Enum(){return OptionEnum;}; + int ObjectEnum(){return OptionEnum;}; Object* copy(){_error_("Not implemented yet");}; /*}}}*/ Index: /issm/trunk/src/c/objects/Options/OptionCell.h =================================================================== --- /issm/trunk/src/c/objects/Options/OptionCell.h (revision 9882) +++ /issm/trunk/src/c/objects/Options/OptionCell.h (revision 9883) @@ -35,5 +35,5 @@ void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; #endif - int Enum(){return OptionCellEnum;}; + int ObjectEnum(){return OptionCellEnum;}; Object* copy(){_error_("Not implemented yet");}; /*}}}*/ Index: /issm/trunk/src/c/objects/Options/OptionChar.h =================================================================== --- /issm/trunk/src/c/objects/Options/OptionChar.h (revision 9882) +++ /issm/trunk/src/c/objects/Options/OptionChar.h (revision 9883) @@ -35,5 +35,5 @@ void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; #endif - int Enum(){return OptionCharEnum;}; + int ObjectEnum(){return OptionCharEnum;}; Object* copy(){_error_("Not implemented yet");}; /*}}}*/ Index: /issm/trunk/src/c/objects/Options/OptionDouble.h =================================================================== --- /issm/trunk/src/c/objects/Options/OptionDouble.h (revision 9882) +++ /issm/trunk/src/c/objects/Options/OptionDouble.h (revision 9883) @@ -35,5 +35,5 @@ void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; #endif - int Enum(){return OptionDoubleEnum;}; + int ObjectEnum(){return OptionDoubleEnum;}; Object* copy(){_error_("Not implemented yet");}; /*}}}*/ Index: /issm/trunk/src/c/objects/Options/OptionLogical.h =================================================================== --- /issm/trunk/src/c/objects/Options/OptionLogical.h (revision 9882) +++ /issm/trunk/src/c/objects/Options/OptionLogical.h (revision 9883) @@ -35,5 +35,5 @@ void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; #endif - int Enum(){return OptionLogicalEnum;}; + int ObjectEnum(){return OptionLogicalEnum;}; Object* copy(){_error_("Not implemented yet");}; /*}}}*/ Index: /issm/trunk/src/c/objects/Options/OptionStruct.h =================================================================== --- /issm/trunk/src/c/objects/Options/OptionStruct.h (revision 9882) +++ /issm/trunk/src/c/objects/Options/OptionStruct.h (revision 9883) @@ -35,5 +35,5 @@ void Demarshall(char** pmarshalled_dataset){_error_("Not implemented yet");}; #endif - int Enum(){return OptionStructEnum;}; + int ObjectEnum(){return OptionStructEnum;}; Object* copy(){_error_("Not implemented yet");}; /*}}}*/ Index: /issm/trunk/src/c/objects/Params/BoolParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/BoolParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/BoolParam.cpp (revision 9883) @@ -113,6 +113,6 @@ /*}}}*/ #endif -/*FUNCTION BoolParam::Enum{{{1*/ -int BoolParam::Enum(void){ +/*FUNCTION BoolParam::ObjectEnum{{{1*/ +int BoolParam::ObjectEnum(void){ return BoolParamEnum; Index: /issm/trunk/src/c/objects/Params/BoolParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/BoolParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/BoolParam.h (revision 9883) @@ -46,9 +46,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param vritual function definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){*pbool=value;} void GetParameterValue(int* pinteger){_error_("Bool param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/DoubleMatArrayParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 9883) @@ -234,6 +234,6 @@ /*}}}*/ #endif -/*FUNCTION DoubleMatArrayParam::Enum{{{1*/ -int DoubleMatArrayParam::Enum(void){ +/*FUNCTION DoubleMatArrayParam::ObjectEnum{{{1*/ +int DoubleMatArrayParam::ObjectEnum(void){ return DoubleMatArrayParamEnum; Index: /issm/trunk/src/c/objects/Params/DoubleMatArrayParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatArrayParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/DoubleMatArrayParam.h (revision 9883) @@ -49,9 +49,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param vritual function definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("DoubleMatArray param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int* pinteger){_error_("DoubleMatArray param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/DoubleMatParam.cpp (revision 9883) @@ -138,6 +138,6 @@ /*}}}*/ #endif -/*FUNCTION DoubleMatParam::Enum{{{1*/ -int DoubleMatParam::Enum(void){ +/*FUNCTION DoubleMatParam::ObjectEnum{{{1*/ +int DoubleMatParam::ObjectEnum(void){ return DoubleMatParamEnum; Index: /issm/trunk/src/c/objects/Params/DoubleMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleMatParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/DoubleMatParam.h (revision 9883) @@ -48,9 +48,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param vritual function definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("DoubleMat param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int* pinteger){_error_("DoubleMat param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/DoubleParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/DoubleParam.cpp (revision 9883) @@ -110,6 +110,6 @@ /*}}}*/ #endif -/*FUNCTION DoubleParam::Enum{{{1*/ -int DoubleParam::Enum(void){ +/*FUNCTION DoubleParam::ObjectEnum{{{1*/ +int DoubleParam::ObjectEnum(void){ return DoubleParamEnum; Index: /issm/trunk/src/c/objects/Params/DoubleParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/DoubleParam.h (revision 9883) @@ -47,9 +47,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param vritual function definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool); void GetParameterValue(int* pinteger); Index: /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/DoubleVecParam.cpp (revision 9883) @@ -132,6 +132,6 @@ /*}}}*/ #endif -/*FUNCTION DoubleVecParam::Enum{{{1*/ -int DoubleVecParam::Enum(void){ +/*FUNCTION DoubleVecParam::ObjectEnum{{{1*/ +int DoubleVecParam::ObjectEnum(void){ return DoubleVecParamEnum; Index: /issm/trunk/src/c/objects/Params/DoubleVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/DoubleVecParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/DoubleVecParam.h (revision 9883) @@ -47,9 +47,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param virtual functions definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("DoubleVec param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int* pinteger){_error_("DoubleVec param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/FileParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/FileParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/FileParam.cpp (revision 9883) @@ -80,6 +80,6 @@ /*}}}*/ #endif -/*FUNCTION FileParam::Enum{{{1*/ -int FileParam::Enum(void){ +/*FUNCTION FileParam::ObjectEnum{{{1*/ +int FileParam::ObjectEnum(void){ return FileParamEnum; Index: /issm/trunk/src/c/objects/Params/FileParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/FileParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/FileParam.h (revision 9883) @@ -46,9 +46,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param vritual function definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){ _error_("FileParam of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int* pinteger){_error_("FileParam of enum %i (%s) cannot return a double",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/IntMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/IntMatParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/IntMatParam.cpp (revision 9883) @@ -138,6 +138,6 @@ /*}}}*/ #endif -/*FUNCTION IntMatParam::Enum{{{1*/ -int IntMatParam::Enum(void){ +/*FUNCTION IntMatParam::ObjectEnum{{{1*/ +int IntMatParam::ObjectEnum(void){ return IntMatParamEnum; Index: /issm/trunk/src/c/objects/Params/IntMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/IntMatParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/IntMatParam.h (revision 9883) @@ -48,9 +48,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param vritual function definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("IntMat param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int* pinteger){_error_("IntMat param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/IntParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/IntParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/IntParam.cpp (revision 9883) @@ -113,6 +113,6 @@ /*}}}*/ #endif -/*FUNCTION IntParam::Enum{{{1*/ -int IntParam::Enum(void){ +/*FUNCTION IntParam::ObjectEnum{{{1*/ +int IntParam::ObjectEnum(void){ return IntParamEnum; Index: /issm/trunk/src/c/objects/Params/IntParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/IntParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/IntParam.h (revision 9883) @@ -47,9 +47,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param vritual function definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("Int param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int* pinteger){*pinteger=value;} Index: /issm/trunk/src/c/objects/Params/IntVecParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/IntVecParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/IntVecParam.cpp (revision 9883) @@ -150,6 +150,6 @@ /*}}}*/ #endif -/*FUNCTION IntVecParam::Enum{{{1*/ -int IntVecParam::Enum(void){ +/*FUNCTION IntVecParam::ObjectEnum{{{1*/ +int IntVecParam::ObjectEnum(void){ return IntVecParamEnum; Index: /issm/trunk/src/c/objects/Params/IntVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/IntVecParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/IntVecParam.h (revision 9883) @@ -48,9 +48,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param virtual functions definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("IntVec param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int* pinteger){_error_("IntVec param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/Param.h =================================================================== --- /issm/trunk/src/c/objects/Params/Param.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/Param.h (revision 9883) @@ -30,5 +30,5 @@ /*Virtual functions:*/ - virtual int EnumType()=0; + virtual int InstanceEnum()=0; virtual void GetParameterValue(bool* pbool)=0; virtual void GetParameterValue(int* pinteger)=0; Index: /issm/trunk/src/c/objects/Params/PetscMatParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/PetscMatParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/PetscMatParam.cpp (revision 9883) @@ -174,6 +174,6 @@ /*}}}*/ #endif -/*FUNCTION PetscMatParam::Enum{{{1*/ -int PetscMatParam::Enum(void){ +/*FUNCTION PetscMatParam::ObjectEnum{{{1*/ +int PetscMatParam::ObjectEnum(void){ return PetscMatParamEnum; Index: /issm/trunk/src/c/objects/Params/PetscMatParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/PetscMatParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/PetscMatParam.h (revision 9883) @@ -47,9 +47,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param vritual function definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("PetscMat param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int* pinteger){_error_("PetscMat param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/PetscVecParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/PetscVecParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/PetscVecParam.cpp (revision 9883) @@ -166,6 +166,6 @@ /*}}}*/ #endif -/*FUNCTION PetscVecParam::Enum{{{1*/ -int PetscVecParam::Enum(void){ +/*FUNCTION PetscVecParam::ObjectEnum{{{1*/ +int PetscVecParam::ObjectEnum(void){ return PetscVecParamEnum; Index: /issm/trunk/src/c/objects/Params/PetscVecParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/PetscVecParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/PetscVecParam.h (revision 9883) @@ -47,9 +47,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param vritual function definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("PetscVec param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int* pinteger){_error_("PetscVec param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/StringArrayParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/StringArrayParam.cpp (revision 9883) @@ -184,6 +184,6 @@ /*}}}*/ #endif -/*FUNCTION StringArrayParam::Enum{{{1*/ -int StringArrayParam::Enum(void){ +/*FUNCTION StringArrayParam::ObjectEnum{{{1*/ +int StringArrayParam::ObjectEnum(void){ return StringArrayParamEnum; Index: /issm/trunk/src/c/objects/Params/StringArrayParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/StringArrayParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/StringArrayParam.h (revision 9883) @@ -49,9 +49,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param vritual function definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("StringArray param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int* pinteger){_error_("StringArray param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Params/StringParam.cpp =================================================================== --- /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Params/StringParam.cpp (revision 9883) @@ -128,6 +128,6 @@ /*}}}*/ #endif -/*FUNCTION StringParam::Enum{{{1*/ -int StringParam::Enum(void){ +/*FUNCTION StringParam::ObjectEnum{{{1*/ +int StringParam::ObjectEnum(void){ return StringParamEnum; Index: /issm/trunk/src/c/objects/Params/StringParam.h =================================================================== --- /issm/trunk/src/c/objects/Params/StringParam.h (revision 9882) +++ /issm/trunk/src/c/objects/Params/StringParam.h (revision 9883) @@ -47,9 +47,9 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ /*Param vritual function definitions: {{{1*/ - int EnumType(){return enum_type;} + int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("String param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} void GetParameterValue(int* pinteger){_error_("String param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk/src/c/objects/Segment.cpp =================================================================== --- /issm/trunk/src/c/objects/Segment.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Segment.cpp (revision 9883) @@ -89,6 +89,6 @@ /*}}}*/ #endif -/*FUNCTION Segment::Enum{{{1*/ -int Segment::Enum(void){ +/*FUNCTION Segment::ObjectEnum{{{1*/ +int Segment::ObjectEnum(void){ return SegmentEnum; Index: /issm/trunk/src/c/objects/Segment.h =================================================================== --- /issm/trunk/src/c/objects/Segment.h (revision 9882) +++ /issm/trunk/src/c/objects/Segment.h (revision 9883) @@ -35,5 +35,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/objects/Vertex.cpp =================================================================== --- /issm/trunk/src/c/objects/Vertex.cpp (revision 9882) +++ /issm/trunk/src/c/objects/Vertex.cpp (revision 9883) @@ -159,6 +159,6 @@ /*}}}*/ #endif -/*FUNCTION Vertex::Enum {{{1*/ -int Vertex::Enum(void){ +/*FUNCTION Vertex::ObjectEnum{{{1*/ +int Vertex::ObjectEnum(void){ return VertexEnum; Index: /issm/trunk/src/c/objects/Vertex.h =================================================================== --- /issm/trunk/src/c/objects/Vertex.h (revision 9882) +++ /issm/trunk/src/c/objects/Vertex.h (revision 9883) @@ -49,5 +49,5 @@ void Demarshall(char** pmarshalled_dataset); #endif - int Enum(); + int ObjectEnum(); Object* copy(); /*}}}*/ Index: /issm/trunk/src/c/shared/Numerics/IsInputConverged.cpp =================================================================== --- /issm/trunk/src/c/shared/Numerics/IsInputConverged.cpp (revision 9882) +++ /issm/trunk/src/c/shared/Numerics/IsInputConverged.cpp (revision 9883) @@ -34,5 +34,5 @@ /*in debugging mode, check that the inputs are of the same type*/ - _assert_(new_inputs[i]->Enum()==old_inputs[i]->Enum()); + _assert_(new_inputs[i]->ObjectEnum()==old_inputs[i]->ObjectEnum()); /*Get pointers*/