Index: /issm/trunk-jpl/src/c/Container/Constraints.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Constraints.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Constraints.cpp (revision 12365) @@ -4,5 +4,5 @@ */ -/*Headers: {{{1*/ +/*Headers: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -25,5 +25,5 @@ /*Object constructors and destructor*/ -/*FUNCTION Constraints::Constraints(){{{1*/ +/*FUNCTION Constraints::Constraints(){{{*/ Constraints::Constraints(){ enum_type=ConstraintsEnum; @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION Constraints::~Constraints(){{{1*/ +/*FUNCTION Constraints::~Constraints(){{{*/ Constraints::~Constraints(){ return; @@ -38,5 +38,5 @@ /*Numerics: */ -/*FUNCTION Constraints::NumberOfConstraints{{{1*/ +/*FUNCTION Constraints::NumberOfConstraints{{{*/ int Constraints::NumberOfConstraints(void){ Index: /issm/trunk-jpl/src/c/Container/Constraints.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Constraints.h (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Constraints.h (revision 12365) @@ -21,9 +21,9 @@ public: - /*constructors, destructors: {{{1*/ + /*constructors, destructors: {{{*/ Constraints(); ~Constraints(); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ int NumberOfConstraints(void); /*}}}*/ Index: /issm/trunk-jpl/src/c/Container/DataSet.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/Container/DataSet.cpp (revision 12365) @@ -4,5 +4,5 @@ */ -/*Headers: {{{1*/ +/*Headers: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -28,5 +28,5 @@ /*Constructors/Destructors*/ -/*FUNCTION DataSet::DataSet(){{{1*/ +/*FUNCTION DataSet::DataSet(){{{*/ DataSet::DataSet(){ @@ -37,5 +37,5 @@ } /*}}}*/ -/*FUNCTION DataSet::DataSet(int dataset_enum){{{1*/ +/*FUNCTION DataSet::DataSet(int dataset_enum){{{*/ DataSet::DataSet(int dataset_enum){ enum_type=dataset_enum; @@ -47,5 +47,5 @@ } /*}}}*/ -/*FUNCTION DataSet::Copy{{{1*/ +/*FUNCTION DataSet::Copy{{{*/ DataSet* DataSet::Copy(void){ @@ -77,5 +77,5 @@ } /*}}}*/ -/*FUNCTION DataSet::~DataSet{{{1*/ +/*FUNCTION DataSet::~DataSet{{{*/ DataSet::~DataSet(){ clear(); @@ -86,5 +86,5 @@ /*Specific methods*/ -/*FUNCTION DataSet::AddObject{{{1*/ +/*FUNCTION DataSet::AddObject{{{*/ int DataSet::AddObject(Object* object){ @@ -94,5 +94,5 @@ } /*}}}*/ -/*FUNCTION DataSet::clear{{{1*/ +/*FUNCTION DataSet::clear{{{*/ void DataSet::clear(){ @@ -112,5 +112,5 @@ } /*}}}*/ -/*FUNCTION DataSet::DeleteObject{{{1*/ +/*FUNCTION DataSet::DeleteObject{{{*/ int DataSet::DeleteObject(Object* object){ @@ -127,5 +127,5 @@ } /*}}}*/ -/*FUNCTION DataSet::DeepEcho{{{1*/ +/*FUNCTION DataSet::DeepEcho{{{*/ void DataSet::DeepEcho(){ @@ -145,5 +145,5 @@ } /*}}}*/ -/*FUNCTION DataSet::Echo{{{1*/ +/*FUNCTION DataSet::Echo{{{*/ void DataSet::Echo(){ @@ -163,10 +163,10 @@ } /*}}}*/ -/*FUNCTION DataSet::GetEnum(){{{1*/ +/*FUNCTION DataSet::GetEnum(){{{*/ int DataSet::GetEnum(){ return enum_type; } /*}}}*/ -/*FUNCTION DataSet::GetEnum(int offset){{{1*/ +/*FUNCTION DataSet::GetEnum(int offset){{{*/ int DataSet::GetEnum(int offset){ @@ -175,5 +175,5 @@ } /*}}}*/ -/*FUNCTION DataSet::GetObjectByOffset{{{1*/ +/*FUNCTION DataSet::GetObjectByOffset{{{*/ Object* DataSet::GetObjectByOffset(int offset){ @@ -186,5 +186,5 @@ } /*}}}*/ -/*FUNCTION DataSet::GetObjectById{{{1*/ +/*FUNCTION DataSet::GetObjectById{{{*/ Object* DataSet::GetObjectById(int* poffset,int eid){ @@ -211,5 +211,5 @@ } /*}}}*/ -/*FUNCTION DataSet::Presort{{{1*/ +/*FUNCTION DataSet::Presort{{{*/ void DataSet::Presort(){ @@ -239,5 +239,5 @@ } /*}}}*/ -/*FUNCTION DataSet::SetSorting{{{1*/ +/*FUNCTION DataSet::SetSorting{{{*/ void DataSet::SetSorting(int* in_sorted_ids,int* in_id_offsets){ @@ -247,5 +247,5 @@ } /*}}}*/ -/*FUNCTION DataSet::Size{{{1*/ +/*FUNCTION DataSet::Size{{{*/ int DataSet::Size(void){ _assert_(this!=NULL); @@ -254,5 +254,5 @@ } /*}}}*/ -/*FUNCTION DataSet::Sort{{{1*/ +/*FUNCTION DataSet::Sort{{{*/ void DataSet::Sort(){ Index: /issm/trunk-jpl/src/c/Container/DataSet.h =================================================================== --- /issm/trunk-jpl/src/c/Container/DataSet.h (revision 12364) +++ /issm/trunk-jpl/src/c/Container/DataSet.h (revision 12365) @@ -39,10 +39,10 @@ int* id_offsets; - /*constructors, destructors: {{{1*/ + /*constructors, destructors: {{{*/ DataSet(); DataSet(int enum_type); ~DataSet(); /*}}}*/ - /*management: {{{1*/ + /*management: {{{*/ int GetEnum(); int GetEnum(int offset); Index: /issm/trunk-jpl/src/c/Container/Elements.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Elements.cpp (revision 12365) @@ -4,5 +4,5 @@ */ -/*Headers: {{{1*/ +/*Headers: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -25,5 +25,5 @@ /*Object constructors and destructor*/ -/*FUNCTION Elements::Elements(){{{1*/ +/*FUNCTION Elements::Elements(){{{*/ Elements::Elements(){ enum_type=MeshElementsEnum; @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION Elements::~Elements(){{{1*/ +/*FUNCTION Elements::~Elements(){{{*/ Elements::~Elements(){ return; @@ -38,5 +38,5 @@ /*Object management*/ -/*FUNCTION Elements::Configure{{{1*/ +/*FUNCTION Elements::Configure{{{*/ void Elements::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ @@ -53,5 +53,5 @@ } /*}}}*/ -/*FUNCTION Elements::ProcessResultsUnits{{{1*/ +/*FUNCTION Elements::ProcessResultsUnits{{{*/ void Elements::ProcessResultsUnits(void){ @@ -63,5 +63,5 @@ } /*}}}*/ -/*FUNCTION Elements::DeleteResults{{{1*/ +/*FUNCTION Elements::DeleteResults{{{*/ void Elements::DeleteResults(void){ @@ -72,5 +72,5 @@ } /*}}}*/ -/*FUNCTION Elements::ResultsToPatch{{{1*/ +/*FUNCTION Elements::ResultsToPatch{{{*/ Patch* Elements::ResultsToPatch(void){ @@ -148,5 +148,5 @@ } /*}}}*/ -/*FUNCTION Elements::SetCurrentConfiguration{{{1*/ +/*FUNCTION Elements::SetCurrentConfiguration{{{*/ void Elements::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ @@ -163,5 +163,5 @@ } /*}}}*/ -/*FUNCTION Elements::ToResults{{{1*/ +/*FUNCTION Elements::ToResults{{{*/ void Elements::ToResults(Results* results,Parameters* parameters){ @@ -276,5 +276,5 @@ } /*}}}*/ -/*FUNCTION Elements::NumberOfElements{{{1*/ +/*FUNCTION Elements::NumberOfElements{{{*/ int Elements::NumberOfElements(void){ @@ -292,5 +292,5 @@ } /*}}}*/ -/*FUNCTION Elements::InputCopy{{{1*/ +/*FUNCTION Elements::InputCopy{{{*/ void Elements::InputDuplicate(int input_enum,int output_enum){ Index: /issm/trunk-jpl/src/c/Container/Elements.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Elements.h (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Elements.h (revision 12365) @@ -21,9 +21,9 @@ public: - /*constructors, destructors: {{{1*/ + /*constructors, destructors: {{{*/ Elements(); ~Elements(); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); void DeleteResults(void); Index: /issm/trunk-jpl/src/c/Container/Inputs.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Inputs.cpp (revision 12365) @@ -4,5 +4,5 @@ */ -/*Headers: {{{1*/ +/*Headers: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -25,10 +25,10 @@ /*Object constructors and destructor*/ -/*FUNCTION Inputs::Inputs(){{{1*/ +/*FUNCTION Inputs::Inputs(){{{*/ Inputs::Inputs(){ return; } /*}}}*/ -/*FUNCTION Inputs::~Inputs(){{{1*/ +/*FUNCTION Inputs::~Inputs(){{{*/ Inputs::~Inputs(){ return; @@ -37,5 +37,5 @@ /*Object management*/ -/*FUNCTION Inputs::GetInputValue(bool* pvalue,int enum-type){{{1*/ +/*FUNCTION Inputs::GetInputValue(bool* pvalue,int enum-type){{{*/ void Inputs::GetInputValue(bool* pvalue,int enum_type){ @@ -65,5 +65,5 @@ } /*}}}*/ -/*FUNCTION Inputs::GetInputValue(int* pvalue,int enum-type){{{1*/ +/*FUNCTION Inputs::GetInputValue(int* pvalue,int enum-type){{{*/ void Inputs::GetInputValue(int* pvalue,int enum_type){ @@ -93,5 +93,5 @@ } /*}}}*/ -/*FUNCTION Inputs::GetInputValue(double* pvalue,int enum-type){{{1*/ +/*FUNCTION Inputs::GetInputValue(double* pvalue,int enum-type){{{*/ void Inputs::GetInputValue(double* pvalue,int enum_type){ @@ -121,5 +121,5 @@ } /*}}}*/ -/*FUNCTION Inputs::GetInputAverage{{{1*/ +/*FUNCTION Inputs::GetInputAverage{{{*/ void Inputs::GetInputAverage(double* pvalue,int enum_type){ @@ -149,5 +149,5 @@ } /*}}}*/ -/*FUNCTION Inputs::AddInput{{{1*/ +/*FUNCTION Inputs::AddInput{{{*/ int Inputs::AddInput(Input* in_input){ @@ -175,5 +175,5 @@ } /*}}}*/ -/*FUNCTION Inputs::ChangeEnum{{{1*/ +/*FUNCTION Inputs::ChangeEnum{{{*/ void Inputs::ChangeEnum(int oldenumtype,int newenumtype){ @@ -205,5 +205,5 @@ } /*}}}*/ -/*FUNCTION Inputs::ConstrainMin{{{1*/ +/*FUNCTION Inputs::ConstrainMin{{{*/ void Inputs::ConstrainMin(int constrain_enum, double minimum){ @@ -219,5 +219,5 @@ } /*}}}*/ -/*FUNCTION Inputs::InfinityNorm{{{1*/ +/*FUNCTION Inputs::InfinityNorm{{{*/ double Inputs::InfinityNorm(int enumtype){ @@ -240,5 +240,5 @@ } /*}}}*/ -/*FUNCTION Inputs::Max{{{1*/ +/*FUNCTION Inputs::Max{{{*/ double Inputs::Max(int enumtype){ @@ -261,5 +261,5 @@ } /*}}}*/ -/*FUNCTION Inputs::MaxAbs{{{1*/ +/*FUNCTION Inputs::MaxAbs{{{*/ double Inputs::MaxAbs(int enumtype){ @@ -282,5 +282,5 @@ } /*}}}*/ -/*FUNCTION Inputs::Min{{{1*/ +/*FUNCTION Inputs::Min{{{*/ double Inputs::Min(int enumtype){ @@ -303,5 +303,5 @@ } /*}}}*/ -/*FUNCTION Inputs::MinAbs{{{1*/ +/*FUNCTION Inputs::MinAbs{{{*/ double Inputs::MinAbs(int enumtype){ @@ -324,5 +324,5 @@ } /*}}}*/ -/*FUNCTION Inputs::GetInput{{{1*/ +/*FUNCTION Inputs::GetInput{{{*/ Input* Inputs::GetInput(int enum_name){ @@ -341,5 +341,5 @@ } /*}}}*/ -/*FUNCTION Inputs::DeleteInput{{{1*/ +/*FUNCTION Inputs::DeleteInput{{{*/ int Inputs::DeleteInput(int enum_type){ @@ -361,5 +361,5 @@ } /*}}}*/ -/*FUNCTION Inputs::DuplicateInput{{{1*/ +/*FUNCTION Inputs::DuplicateInput{{{*/ void Inputs::DuplicateInput(int original_enum,int new_enum){ @@ -379,5 +379,5 @@ } /*}}}*/ -/*FUNCTION Inputs::SpawnTriaInputs{{{1*/ +/*FUNCTION Inputs::SpawnTriaInputs{{{*/ Inputs* Inputs::SpawnTriaInputs(int* indices){ @@ -405,5 +405,5 @@ } /*}}}*/ -/*FUNCTION Inputs::AXPY{{{1*/ +/*FUNCTION Inputs::AXPY{{{*/ void Inputs::AXPY(int MeshYEnum, double scalar, int MeshXEnum){ @@ -423,5 +423,5 @@ } /*}}}*/ -/*FUNCTION Inputs::Configure{{{1*/ +/*FUNCTION Inputs::Configure{{{*/ void Inputs::Configure(Parameters* parameters){ Index: /issm/trunk-jpl/src/c/Container/Inputs.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Inputs.h (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Inputs.h (revision 12365) @@ -23,10 +23,10 @@ public: - /*constructors, destructors: {{{1*/ + /*constructors, destructors: {{{*/ Inputs(); ~Inputs(); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ int AddInput(Input* in_input); void ChangeEnum(int enumtype,int new_enumtype); Index: /issm/trunk-jpl/src/c/Container/Loads.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Loads.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Loads.cpp (revision 12365) @@ -4,5 +4,5 @@ */ -/*Headers: {{{1*/ +/*Headers: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -25,5 +25,5 @@ /*Object constructors and destructor*/ -/*FUNCTION Loads::Loads(){{{1*/ +/*FUNCTION Loads::Loads(){{{*/ Loads::Loads(){ enum_type=LoadsEnum; @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION Loads::~Loads(){{{1*/ +/*FUNCTION Loads::~Loads(){{{*/ Loads::~Loads(){ return; @@ -38,5 +38,5 @@ /*Numerics:*/ -/*FUNCTION Loads::Configure{{{1*/ +/*FUNCTION Loads::Configure{{{*/ void Loads::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ @@ -53,5 +53,5 @@ } /*}}}*/ -/*FUNCTION Loads::NumberOfLoads{{{1*/ +/*FUNCTION Loads::NumberOfLoads{{{*/ int Loads::NumberOfLoads(void){ @@ -74,5 +74,5 @@ } /*}}}*/ -/*FUNCTION Loads::SetCurrentConfiguration{{{1*/ +/*FUNCTION Loads::SetCurrentConfiguration{{{*/ void Loads::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ Index: /issm/trunk-jpl/src/c/Container/Loads.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Loads.h (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Loads.h (revision 12365) @@ -20,9 +20,9 @@ public: - /*constructors, destructors: {{{1*/ + /*constructors, destructors: {{{*/ Loads(); ~Loads(); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); int NumberOfLoads(void); Index: /issm/trunk-jpl/src/c/Container/Materials.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Materials.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Materials.cpp (revision 12365) @@ -4,5 +4,5 @@ */ -/*Headers: {{{1*/ +/*Headers: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -25,5 +25,5 @@ /*Object constructors and destructor*/ -/*FUNCTION Materials::Materials(){{{1*/ +/*FUNCTION Materials::Materials(){{{*/ Materials::Materials(){ enum_type=MaterialsEnum; @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION Materials::~Materials(){{{1*/ +/*FUNCTION Materials::~Materials(){{{*/ Materials::~Materials(){ return; @@ -38,5 +38,5 @@ /*Object management*/ -/*FUNCTION Materials::Configure{{{1*/ +/*FUNCTION Materials::Configure{{{*/ void Materials::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ Index: /issm/trunk-jpl/src/c/Container/Materials.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Materials.h (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Materials.h (revision 12365) @@ -19,9 +19,9 @@ public: - /*constructors, destructors: {{{1*/ + /*constructors, destructors: {{{*/ Materials(); ~Materials(); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); /*}}}*/ Index: /issm/trunk-jpl/src/c/Container/Nodes.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Nodes.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Nodes.cpp (revision 12365) @@ -4,5 +4,5 @@ */ -/*Headers: {{{1*/ +/*Headers: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -25,5 +25,5 @@ /*Object constructors and destructor*/ -/*FUNCTION Nodes::Nodes(){{{1*/ +/*FUNCTION Nodes::Nodes(){{{*/ Nodes::Nodes(){ enum_type=NodesEnum; @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION Nodes::~Nodes(){{{1*/ +/*FUNCTION Nodes::~Nodes(){{{*/ Nodes::~Nodes(){ return; @@ -38,5 +38,5 @@ /*Numerics*/ -/*FUNCTION Nodes::Configure{{{1*/ +/*FUNCTION Nodes::Configure{{{*/ void Nodes::Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ @@ -53,5 +53,5 @@ } /*}}}*/ -/*FUNCTION Nodes::DistributeDofs{{{1*/ +/*FUNCTION Nodes::DistributeDofs{{{*/ void Nodes::DistributeDofs(int analysis_type,int setenum){ @@ -144,5 +144,5 @@ } /*}}}*/ -/*FUNCTION Nodes::FlagClones{{{1*/ +/*FUNCTION Nodes::FlagClones{{{*/ void Nodes::FlagClones(int analysis_type){ @@ -195,5 +195,5 @@ } /*}}}*/ -/*FUNCTION Nodes::MaxNumDofs{{{1*/ +/*FUNCTION Nodes::MaxNumDofs{{{*/ int Nodes::MaxNumDofs(int analysis_type,int setenum){ @@ -225,5 +225,5 @@ } /*}}}*/ -/*FUNCTION Nodes::NumberOfDofs{{{1*/ +/*FUNCTION Nodes::NumberOfDofs{{{*/ int Nodes::NumberOfDofs(int analysis_type,int setenum){ @@ -259,5 +259,5 @@ } /*}}}*/ -/*FUNCTION Nodes::NumberOfNodes(){{{1*/ +/*FUNCTION Nodes::NumberOfNodes(){{{*/ int Nodes::NumberOfNodes(void){ @@ -287,5 +287,5 @@ } /*}}}*/ -/*FUNCTION Nodes::NumberOfNodes(analysis){{{1*/ +/*FUNCTION Nodes::NumberOfNodes(analysis){{{*/ int Nodes::NumberOfNodes(int analysis_type){ @@ -326,5 +326,5 @@ } /*}}}*/ -/*FUNCTION Nodes::Ranks{{{1*/ +/*FUNCTION Nodes::Ranks{{{*/ void Nodes::Ranks(int* ranks,int analysis_type){ @@ -352,5 +352,5 @@ } /*}}}*/ -/*FUNCTION Nodes::SetCurrentConfiguration{{{1*/ +/*FUNCTION Nodes::SetCurrentConfiguration{{{*/ void Nodes::SetCurrentConfiguration(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters){ Index: /issm/trunk-jpl/src/c/Container/Nodes.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Nodes.h (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Nodes.h (revision 12365) @@ -13,9 +13,9 @@ public: - /*constructors, destructors: {{{1*/ + /*constructors, destructors: {{{*/ Nodes(); ~Nodes(); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void Configure(Elements* elements,Loads* loads, Nodes* nodes, Vertices* vertices, Materials* materials,Parameters* parameters); void DistributeDofs(int analysis_type,int SETENUM); Index: /issm/trunk-jpl/src/c/Container/Options.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Options.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Options.cpp (revision 12365) @@ -4,5 +4,5 @@ */ -/*Headers: {{{1*/ +/*Headers: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -25,10 +25,10 @@ /*Object constructors and destructor*/ -/*FUNCTION Options::Options(){{{1*/ +/*FUNCTION Options::Options(){{{*/ Options::Options(){ return; } /*}}}*/ -/*FUNCTION Options::~Options(){{{1*/ +/*FUNCTION Options::~Options(){{{*/ Options::~Options(){ return; @@ -37,5 +37,5 @@ /*Object management*/ -/*FUNCTION Options::AddOption{{{1*/ +/*FUNCTION Options::AddOption{{{*/ int Options::AddOption(Option* in_option){ @@ -68,5 +68,5 @@ } /*}}}*/ -/*FUNCTION Options::Get(int* pvalue, char* name){{{1*/ +/*FUNCTION Options::Get(int* pvalue, char* name){{{*/ void Options::Get(int* pvalue,const char* name){ @@ -87,5 +87,5 @@ } /*}}}*/ -/*FUNCTION Options::Get(int* pvalue, char* name,int default_value){{{1*/ +/*FUNCTION Options::Get(int* pvalue, char* name,int default_value){{{*/ void Options::Get(int* pvalue,const char* name,int default_value){ @@ -106,5 +106,5 @@ } /*}}}*/ -/*FUNCTION Options::Get(double* pvalue, char* name){{{1*/ +/*FUNCTION Options::Get(double* pvalue, char* name){{{*/ void Options::Get(double* pvalue,const char* name){ @@ -125,5 +125,5 @@ } /*}}}*/ -/*FUNCTION Options::Get(double* pvalue, char* name,double default_value){{{1*/ +/*FUNCTION Options::Get(double* pvalue, char* name,double default_value){{{*/ void Options::Get(double* pvalue,const char* name,double default_value){ @@ -144,5 +144,5 @@ } /*}}}*/ -/*FUNCTION Options::Get(bool* pvalue, char* name){{{1*/ +/*FUNCTION Options::Get(bool* pvalue, char* name){{{*/ void Options::Get(bool* pvalue,const char* name){ @@ -163,5 +163,5 @@ } /*}}}*/ -/*FUNCTION Options::Get(bool* pvalue, char* name,bool default_value){{{1*/ +/*FUNCTION Options::Get(bool* pvalue, char* name,bool default_value){{{*/ void Options::Get(bool* pvalue,const char* name,bool default_value){ @@ -182,5 +182,5 @@ } /*}}}*/ -/*FUNCTION Options::Get(char** pvalue, char* name){{{1*/ +/*FUNCTION Options::Get(char** pvalue, char* name){{{*/ void Options::Get(char** pvalue,const char* name){ @@ -204,5 +204,5 @@ } /*}}}*/ -/*FUNCTION Options::Get(char** pvalue, char* name,char* default_value){{{1*/ +/*FUNCTION Options::Get(char** pvalue, char* name,char* default_value){{{*/ void Options::Get(char** pvalue,const char* name,const char* default_value){ @@ -229,5 +229,5 @@ } /*}}}*/ -/*FUNCTION Options::Get(char*** ppvalue,int* numel,char* name){{{1*/ +/*FUNCTION Options::Get(char*** ppvalue,int* numel,char* name){{{*/ void Options::Get(char*** ppvalue,int* numel,const char* name){ @@ -275,5 +275,5 @@ } /*}}}*/ -/*FUNCTION Options::Get(double** pvalue,int* numel,const char* name){{{1*/ +/*FUNCTION Options::Get(double** pvalue,int* numel,const char* name){{{*/ void Options::Get(double** pvalue,int* numel,const char* name){ @@ -294,5 +294,5 @@ } /*}}}*/ -/*FUNCTION Options::GetOption{{{1*/ +/*FUNCTION Options::GetOption{{{*/ Option* Options::GetOption(const char* name){ Index: /issm/trunk-jpl/src/c/Container/Parameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Parameters.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Parameters.cpp (revision 12365) @@ -4,5 +4,5 @@ */ -/*Headers: {{{1*/ +/*Headers: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -25,5 +25,5 @@ /*Object constructors and destructor*/ -/*FUNCTION Parameters::Parameters(){{{1*/ +/*FUNCTION Parameters::Parameters(){{{*/ Parameters::Parameters(){ enum_type=ParametersEnum; @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION Parameters::~Parameters(){{{1*/ +/*FUNCTION Parameters::~Parameters(){{{*/ Parameters::~Parameters(){ return; @@ -38,5 +38,5 @@ /*Object management*/ -/*FUNCTION Parameters::Exist{{{1*/ +/*FUNCTION Parameters::Exist{{{*/ bool Parameters::Exist(int enum_type){ @@ -51,5 +51,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(bool* pbool,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(bool* pbool,int enum_type){{{*/ void Parameters::FindParam(bool* pbool,int enum_type){ _assert_(this); @@ -68,5 +68,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(int* pinteger,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(int* pinteger,int enum_type){{{*/ void Parameters::FindParam(int* pinteger,int enum_type){ _assert_(this); @@ -85,5 +85,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(double* pscalar, int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(double* pscalar, int enum_type){{{*/ void Parameters::FindParam(double* pscalar, int enum_type){ _assert_(this); @@ -102,5 +102,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(char** pstring,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(char** pstring,int enum_type){{{*/ void Parameters::FindParam(char** pstring,int enum_type){ _assert_(this); @@ -120,5 +120,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){{{*/ void Parameters::FindParam(char*** pstringarray,int* pM,int enum_type){ _assert_(this); @@ -138,5 +138,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int enum_type){{{*/ void Parameters::FindParam(int** pintarray,int* pM, int enum_type){ _assert_(this); @@ -156,5 +156,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int* pN,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(int** pintarray,int* pM,int* pN,int enum_type){{{*/ void Parameters::FindParam(int** pintarray,int* pM,int *pN,int enum_type){ _assert_(this); @@ -174,5 +174,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM,int enum_type){{{*/ void Parameters::FindParam(double** pdoublearray,int* pM, int enum_type){ _assert_(this); @@ -192,5 +192,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){{{*/ void Parameters::FindParam(double** pdoublearray,int* pM, int* pN,int enum_type){ _assert_(this); @@ -210,5 +210,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(double*** parray,int* pM,int** pmdims_array,int** pndims_array,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(double*** parray,int* pM,int** pmdims_array,int** pndims_array,int enum_type){{{*/ void Parameters::FindParam(double*** parray,int* pM,int** pmdims_array,int** pndims_array,int enum_type){ _assert_(this); @@ -227,5 +227,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(Vector** pvec,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(Vector** pvec,int enum_type){{{*/ void Parameters::FindParam(Vector** pvec,int enum_type){ _assert_(this); @@ -245,5 +245,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(Matrix** pmat,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(Matrix** pmat,int enum_type){{{*/ void Parameters::FindParam(Matrix** pmat,int enum_type){ _assert_(this); @@ -263,5 +263,5 @@ } /*}}}*/ -/*FUNCTION Parameters::FindParam(FILE** pfid,int enum_type){{{1*/ +/*FUNCTION Parameters::FindParam(FILE** pfid,int enum_type){{{*/ void Parameters::FindParam(FILE** pfid,int enum_type){ _assert_(this); @@ -281,5 +281,5 @@ /*}}}*/ -/*FUNCTION Parameters::SetParam(bool boolean,int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(bool boolean,int enum_type);{{{*/ void Parameters::SetParam(bool boolean,int enum_type){ @@ -293,5 +293,5 @@ } /*}}}*/ -/*FUNCTION Parameters::SetParam(int integer,int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(int integer,int enum_type);{{{*/ void Parameters::SetParam(int integer,int enum_type){ @@ -305,5 +305,5 @@ } /*}}}*/ -/*FUNCTION Parameters::SetParam(double scalar,int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(double scalar,int enum_type);{{{*/ void Parameters::SetParam(double scalar,int enum_type){ @@ -317,5 +317,5 @@ } /*}}}*/ -/*FUNCTION Parameters::SetParam(char* string,int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(char* string,int enum_type);{{{*/ void Parameters::SetParam(char* string,int enum_type){ @@ -329,5 +329,5 @@ } /*}}}*/ -/*FUNCTION Parameters::SetParam(char** stringarray,int M, int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(char** stringarray,int M, int enum_type);{{{*/ void Parameters::SetParam(char** stringarray,int M, int enum_type){ @@ -341,5 +341,5 @@ } /*}}}*/ -/*FUNCTION Parameters::SetParam(double* doublearray,int M,int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(double* doublearray,int M,int enum_type);{{{*/ void Parameters::SetParam(double* doublearray,int M, int enum_type){ @@ -353,5 +353,5 @@ } /*}}}*/ -/*FUNCTION Parameters::SetParam(double* doublearray,int M,int N, int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(double* doublearray,int M,int N, int enum_type);{{{*/ void Parameters::SetParam(double* doublearray,int M, int N, int enum_type){ @@ -365,5 +365,5 @@ } /*}}}*/ -/*FUNCTION Parameters::SetParam(int* intarray,int M,int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(int* intarray,int M,int enum_type);{{{*/ void Parameters::SetParam(int* intarray,int M, int enum_type){ @@ -377,5 +377,5 @@ } /*}}}*/ -/*FUNCTION Parameters::SetParam(int* intarray,int M,int N, int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(int* intarray,int M,int N, int enum_type);{{{*/ void Parameters::SetParam(int* intarray,int M, int N, int enum_type){ @@ -389,5 +389,5 @@ } /*}}}*/ -/*FUNCTION Parameters::SetParam(Vector* vector,int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(Vector* vector,int enum_type);{{{*/ void Parameters::SetParam(Vector* vector,int enum_type){ @@ -401,5 +401,5 @@ } /*}}}*/ -/*FUNCTION Parameters::SetParam(Matrix* matrix,int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(Matrix* matrix,int enum_type);{{{*/ void Parameters::SetParam(Matrix* matrix,int enum_type){ @@ -413,5 +413,5 @@ } /*}}}*/ -/*FUNCTION Parameters::SetParam(FILE* fid,int enum_type);{{{1*/ +/*FUNCTION Parameters::SetParam(FILE* fid,int enum_type);{{{*/ void Parameters::SetParam(FILE* fid,int enum_type){ @@ -425,5 +425,5 @@ } /*}}}*/ -/*FUNCTION Parameters::UnitConversion(int direction_enum);{{{1*/ +/*FUNCTION Parameters::UnitConversion(int direction_enum);{{{*/ void Parameters::UnitConversion(int direction_enum){ @@ -439,5 +439,5 @@ /*}}}*/ -/*FUNCTION Parameters::FindParamObject{{{1*/ +/*FUNCTION Parameters::FindParamObject{{{*/ Object* Parameters::FindParamObject(int enum_type){ Index: /issm/trunk-jpl/src/c/Container/Parameters.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Parameters.h (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Parameters.h (revision 12365) @@ -23,9 +23,9 @@ public: - /*constructors, destructors: {{{1*/ + /*constructors, destructors: {{{*/ Parameters(); ~Parameters(); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ bool Exist(int enum_type); Index: /issm/trunk-jpl/src/c/Container/Results.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Results.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Results.cpp (revision 12365) @@ -4,5 +4,5 @@ */ -/*Headers: {{{1*/ +/*Headers: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -25,5 +25,5 @@ /*Object constructors and destructor*/ -/*FUNCTION Results::Results(){{{1*/ +/*FUNCTION Results::Results(){{{*/ Results::Results(){ enum_type=ResultsEnum; @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION Results::~Results(){{{1*/ +/*FUNCTION Results::~Results(){{{*/ Results::~Results(){ return; @@ -38,5 +38,5 @@ /*Object management*/ -/*FUNCTION Results::SpawnTriaResults{{{1*/ +/*FUNCTION Results::SpawnTriaResults{{{*/ Results* Results::SpawnTriaResults(int* indices){ @@ -64,5 +64,5 @@ } /*}}}*/ -/*FUNCTION Results::Write{{{1*/ +/*FUNCTION Results::Write{{{*/ void Results::Write(Parameters* parameters){ Index: /issm/trunk-jpl/src/c/Container/Results.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Results.h (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Results.h (revision 12365) @@ -20,9 +20,9 @@ public: - /*constructors, destructors: {{{1*/ + /*constructors, destructors: {{{*/ Results(); ~Results(); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ Results* SpawnTriaResults(int* indices); void Write(Parameters* parameters); Index: /issm/trunk-jpl/src/c/Container/Vertices.cpp =================================================================== --- /issm/trunk-jpl/src/c/Container/Vertices.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Vertices.cpp (revision 12365) @@ -4,5 +4,5 @@ */ -/*Headers: {{{1*/ +/*Headers: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -25,5 +25,5 @@ /*Object constructors and destructor*/ -/*FUNCTION Vertices::Vertices(){{{1*/ +/*FUNCTION Vertices::Vertices(){{{*/ Vertices::Vertices(){ enum_type=VerticesEnum; @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION Vertices::~Vertices(){{{1*/ +/*FUNCTION Vertices::~Vertices(){{{*/ Vertices::~Vertices(){ return; @@ -38,5 +38,5 @@ /*Numerics management*/ -/*FUNCTION Vertices::DistributeDofs{{{1*/ +/*FUNCTION Vertices::DistributeDofs{{{*/ void Vertices::DistributeDofs(int numberofobjects,int numberofdofsperobject){ @@ -107,5 +107,5 @@ } /*}}}*/ -/*FUNCTION Vertices::FlagClones{{{1*/ +/*FUNCTION Vertices::FlagClones{{{*/ void Vertices::FlagClones(int numberofobjects){ @@ -148,5 +148,5 @@ } /*}}}*/ -/*FUNCTION Vertices::NumberOfVertices{{{1*/ +/*FUNCTION Vertices::NumberOfVertices{{{*/ int Vertices::NumberOfVertices(void){ @@ -174,5 +174,5 @@ } /*}}}*/ -/*FUNCTION Vertices::Ranks{{{1*/ +/*FUNCTION Vertices::Ranks{{{*/ void Vertices::Ranks(int* ranks){ Index: /issm/trunk-jpl/src/c/Container/Vertices.h =================================================================== --- /issm/trunk-jpl/src/c/Container/Vertices.h (revision 12364) +++ /issm/trunk-jpl/src/c/Container/Vertices.h (revision 12365) @@ -19,9 +19,9 @@ public: - /*constructors, destructors: {{{1*/ + /*constructors, destructors: {{{*/ Vertices(); ~Vertices(); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void DistributeDofs(int numberofnodes,int numdofspernode); void FlagClones(int numberofnodes); Index: /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 12364) +++ /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 12365) @@ -11,5 +11,5 @@ enum definitions{ - /*Model fields {{{1*/ + /*Model fields {{{*/ AutodiffForwardEnum, AutodiffIsautodiffEnum, @@ -183,5 +183,5 @@ TransientRequestedOutputsEnum, /*}}}*/ - /*Solutions and Analyses{{{1 */ + /*Solutions and Analyses{{{ */ SolutionTypeEnum, AnalysisTypeEnum, @@ -220,5 +220,5 @@ TransientSolutionEnum, /*}}}*/ - /*Approximations {{{1*/ + /*Approximations {{{*/ ApproximationEnum, HutterApproximationEnum, @@ -231,5 +231,5 @@ StokesApproximationEnum, /*}}}*/ - /*Datasets {{{1*/ + /*Datasets {{{*/ ConstraintsEnum, LoadsEnum, @@ -240,5 +240,5 @@ ResultsEnum, /*}}}*/ - /*Objects {{{1*/ + /*Objects {{{*/ BoolInputEnum, BoolParamEnum, @@ -289,5 +289,5 @@ VertexEnum, /*}}}*/ - /*Fill {{{1*/ + /*Fill {{{*/ AirEnum, IceEnum, @@ -295,10 +295,10 @@ WaterEnum, /*}}}*/ - /*Rift state {{{1*/ + /*Rift state {{{*/ ClosedEnum, FreeEnum, OpenEnum, /*}}}*/ - /*Inputs {{{1*/ + /*Inputs {{{*/ AdjointpEnum, AdjointxEnum, @@ -388,10 +388,10 @@ IceVolumeEnum, /*}}}*/ - /*Element Interpolations{{{1*/ + /*Element Interpolations{{{*/ P0Enum, P1Enum, P1DGEnum, /*}}}*/ - /*Results{{{1*/ + /*Results{{{*/ SaveResultsEnum, BoolElementResultEnum, @@ -414,5 +414,5 @@ WaterColumnOldEnum, /*}}}*/ - /*Responses{{{1*/ + /*Responses{{{*/ MinVelEnum, MaxVelEnum, @@ -427,18 +427,18 @@ MaxAbsVzEnum, /*}}}*/ - /*Convergence{{{1*/ + /*Convergence{{{*/ RelativeEnum, AbsoluteEnum, IncrementalEnum, /*}}}*/ - /*Grounding Line{{{1*/ + /*Grounding Line{{{*/ AgressiveMigrationEnum, NoneEnum, SoftMigrationEnum, /*}}}*/ - /*Solver{{{1*/ + /*Solver{{{*/ StokesSolverEnum, /*}}}*/ - /*Parameters{{{1*/ + /*Parameters{{{*/ AdjointEnum, ColinearEnum, @@ -468,14 +468,14 @@ VerboseEnum, /*}}}*/ - /*Interpolation {{{1*/ + /*Interpolation {{{*/ TriangleInterpEnum, BilinearInterpEnum, NearestInterpEnum, /*}}}*/ - /*Coordinate Systems{{{1*/ + /*Coordinate Systems{{{*/ XYEnum, XYZPEnum, /*}}}*/ - /*Options{{{1*/ + /*Options{{{*/ OptionEnum, OptionCellEnum, @@ -485,5 +485,5 @@ OptionLogicalEnum, /*}}}*/ - /*Rheology law (move too Material) {{{1*/ + /*Rheology law (move too Material) {{{*/ PatersonEnum, ArrheniusEnum, Index: /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh =================================================================== --- /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 12364) +++ /issm/trunk-jpl/src/c/EnumDefinitions/Synchronize.sh (revision 12365) @@ -56,5 +56,5 @@ END #}}} -#Build StringToEnumx.cpp {{{1 +#Build StringToEnumx.cpp {{{ #Header cat < $ISSM_DIR/src/c/modules/StringToEnumx/StringToEnumx.cpp Index: /issm/trunk-jpl/src/c/include/macros.h =================================================================== --- /issm/trunk-jpl/src/c/include/macros.h (revision 12364) +++ /issm/trunk-jpl/src/c/include/macros.h (revision 12365) @@ -3,5 +3,5 @@ */ -/*Header {{{1*/ +/*Header {{{*/ #ifndef _MACROS_H_ #define _MACROS_H_ @@ -16,9 +16,9 @@ /*}}}*/ -/* _printf_ {{{1*/ +/* _printf_ {{{*/ /*Printing macro: only cpu number 0 */ #define _printf_(flag,...) do { if(flag) PrintfFunction(__VA_ARGS__); }while (0) /*}}}*/ -/* _error_ {{{1*/ +/* _error_ {{{*/ /*Error exception macro*/ #ifdef _INTEL_WIN_ @@ -30,5 +30,5 @@ #endif /*}}}*/ -/* _assert_ {{{1*/ +/* _assert_ {{{*/ /*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/ #ifdef _ISSM_DEBUG_ @@ -40,5 +40,5 @@ #endif /*}}}*/ -/* ISSMBOOT/ISSMEND {{{1*/ +/* ISSMBOOT/ISSMEND {{{*/ /*The following macros hide the error exception handling in a matlab module. Just put Index: /issm/trunk-jpl/src/c/io/io.h =================================================================== --- /issm/trunk-jpl/src/c/io/io.h (revision 12364) +++ /issm/trunk-jpl/src/c/io/io.h (revision 12365) @@ -6,5 +6,5 @@ #define _ISSM_IO_H_ -#ifdef HAVE_CONFIG_H //config.h {{{1 +#ifdef HAVE_CONFIG_H //config.h {{{ #include #else Index: /issm/trunk-jpl/src/c/matlab/include/matlab_macros.h =================================================================== --- /issm/trunk-jpl/src/c/matlab/include/matlab_macros.h (revision 12364) +++ /issm/trunk-jpl/src/c/matlab/include/matlab_macros.h (revision 12365) @@ -3,5 +3,5 @@ */ -/*Header {{{1*/ +/*Header {{{*/ #ifndef _MATLAB_MACROS_H_ #define _MATLAB_MACROS_H_ @@ -15,5 +15,5 @@ #ifdef _HAVE_MATLAB_ -/* MODULEBOOT/MODULEEND {{{1*/ +/* MODULEBOOT/MODULEEND {{{*/ /*The following macros hide the error exception handling in a matlab module. Just put @@ -36,9 +36,9 @@ } //}}} -/* WRAPPER {{{1*/ +/* WRAPPER {{{*/ #define WRAPPER(modulename,...) void mexFunction(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) /*}}}*/ -/* CHECKARGUMENTS {{{1*/ +/* CHECKARGUMENTS {{{*/ #define CHECKARGUMENTS(NLHS,NRHS,functionpointer) CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,functionpointer) /*}}}*/ Index: /issm/trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/matlab/io/FetchMatlabData.cpp (revision 12365) @@ -15,5 +15,5 @@ /*Primitive data types*/ -/*FUNCTION FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){{{*/ void FetchData(double** pmatrix,int* pM,int *pN,const mxArray* dataref){ @@ -51,5 +51,5 @@ } /*}}}*/ -/*FUNCTION FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{*/ void FetchData(double** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){ @@ -94,5 +94,5 @@ } /*}}}*/ -/*FUNCTION FetchData(int** pmatrix,int* pM,int *pN,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(int** pmatrix,int* pM,int *pN,const mxArray* dataref){{{*/ void FetchData(int** pmatrix,int* pM,int *pN,const mxArray* dataref){ @@ -136,5 +136,5 @@ } /*}}}*/ -/*FUNCTION FetchData(bool** pmatrix,int* pM,int *pN,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(bool** pmatrix,int* pM,int *pN,const mxArray* dataref){{{*/ void FetchData(bool** pmatrix,int* pM,int *pN,const mxArray* dataref){ @@ -178,5 +178,5 @@ } /*}}}*/ -/*FUNCTION FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{*/ void FetchData(bool** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){ @@ -243,5 +243,5 @@ } /*}}}*/ -/*FUNCTION FetchData(double** pvector,int* pM,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(double** pvector,int* pM,const mxArray* dataref){{{*/ void FetchData(double** pvector,int* pM,const mxArray* dataref){ @@ -270,5 +270,5 @@ } /*}}}*/ -/*FUNCTION FetchData(int** pvector,int* pM,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(int** pvector,int* pM,const mxArray* dataref){{{*/ void FetchData(int** pvector,int* pM,const mxArray* dataref){ @@ -302,5 +302,5 @@ } /*}}}*/ -/*FUNCTION FetchData(bool** pvector,int* pM,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(bool** pvector,int* pM,const mxArray* dataref){{{*/ void FetchData(bool** pvector,int* pM,const mxArray* dataref){ @@ -334,5 +334,5 @@ } /*}}}*/ -/*FUNCTION FetchData(float** pvector,int* pM,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(float** pvector,int* pM,const mxArray* dataref){{{*/ void FetchData(float** pvector,int* pM,const mxArray* dataref){ @@ -366,5 +366,5 @@ } /*}}}*/ -/*FUNCTION FetchData(char** pstring,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(char** pstring,const mxArray* dataref){{{*/ void FetchData(char** pstring,const mxArray* dataref){ @@ -388,5 +388,5 @@ *pstring=outstring; } -/*FUNCTION FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){{{*/ void FetchData(char** pmatrix,int* pnumel,int* pndims,int** psize,const mxArray* dataref){ @@ -421,5 +421,5 @@ } /*}}}*/ -/*FUNCTION FetchData(double* pscalar,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(double* pscalar,const mxArray* dataref){{{*/ void FetchData(double* pscalar,const mxArray* dataref){ @@ -438,5 +438,5 @@ } /*}}}*/ -/*FUNCTION FetchData(int* pinteger,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(int* pinteger,const mxArray* dataref){{{*/ void FetchData(int* pinteger,const mxArray* dataref){ @@ -455,5 +455,5 @@ } /*}}}*/ -/*FUNCTION FetchData(bool* pboolean,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(bool* pboolean,const mxArray* dataref){{{*/ void FetchData(bool* pboolean,const mxArray* dataref){ @@ -474,5 +474,5 @@ /*ISSM objects*/ -/*FUNCTION FetchData(Matrix** pmatrix,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(Matrix** pmatrix,const mxArray* dataref){{{*/ void FetchData(Matrix** pmatrix,const mxArray* dataref){ @@ -495,5 +495,5 @@ } /*}}}*/ -/*FUNCTION FetchData(Vector** pvector,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(Vector** pvector,const mxArray* dataref){{{*/ void FetchData(Vector** pvector,const mxArray* dataref){ @@ -519,5 +519,5 @@ } /*}}}*/ -/*FUNCTION FetchData(BamgGeom** pbamggeom,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(BamgGeom** pbamggeom,const mxArray* dataref){{{*/ void FetchData(BamgGeom** pbamggeom,const mxArray* dataref){ @@ -538,5 +538,5 @@ } /*}}}*/ -/*FUNCTION FetchData(BamgMesh** pbamgmesh,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(BamgMesh** pbamgmesh,const mxArray* dataref){{{*/ void FetchData(BamgMesh** pbamgmesh,const mxArray* dataref){ @@ -558,5 +558,5 @@ } /*}}}*/ -/*FUNCTION FetchData(BamgOpts** pbamgopts,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(BamgOpts** pbamgopts,const mxArray* dataref){{{*/ void FetchData(BamgOpts** pbamgopts,const mxArray* dataref){ @@ -602,5 +602,5 @@ } /*}}}*/ -/*FUNCTION FetchData(Options** poptions,const mxArray* dataref){{{1*/ +/*FUNCTION FetchData(Options** poptions,const mxArray* dataref){{{*/ void FetchData(Options** poptions,int istart, int nrhs,const mxArray** pdataref){ Index: /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToMatrix.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToMatrix.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToMatrix.cpp (revision 12365) @@ -3,5 +3,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include Index: /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToSeqMat.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToSeqMat.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabMatrixToSeqMat.cpp (revision 12365) @@ -3,5 +3,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include Index: /issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp (revision 12365) @@ -15,5 +15,5 @@ #include -/*FUNCTION MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{1*/ +/*FUNCTION MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{*/ int MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){ @@ -95,5 +95,5 @@ } /*}}}*/ -/*FUNCTION MatlabNArrayToNArray(bool** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{1*/ +/*FUNCTION MatlabNArrayToNArray(bool** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{*/ int MatlabNArrayToNArray(bool** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){ @@ -175,5 +175,5 @@ } /*}}}*/ -/*FUNCTION MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{1*/ +/*FUNCTION MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{*/ int MatlabNArrayToNArray(char** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){ Index: /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToSeqVec.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToSeqVec.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToSeqVec.cpp (revision 12365) @@ -3,5 +3,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include Index: /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToVector.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToVector.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/matlab/io/MatlabVectorToVector.cpp (revision 12365) @@ -3,5 +3,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include Index: /issm/trunk-jpl/src/c/matlab/io/OptionParse.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/OptionParse.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/matlab/io/OptionParse.cpp (revision 12365) @@ -15,5 +15,5 @@ #include -/*FUNCTION OptionDoubleParse {{{1*/ +/*FUNCTION OptionDoubleParse {{{*/ OptionDouble* OptionDoubleParse( char* name, const mxArray* prhs[]){ @@ -34,5 +34,5 @@ return(odouble); }/*}}}*/ -/*FUNCTION OptionLogicalParse {{{1*/ +/*FUNCTION OptionLogicalParse {{{*/ OptionLogical* OptionLogicalParse( char* name, const mxArray* prhs[]){ @@ -53,5 +53,5 @@ return(ological); }/*}}}*/ -/*FUNCTION OptionCharParse {{{1*/ +/*FUNCTION OptionCharParse {{{*/ OptionChar* OptionCharParse( char* name, const mxArray* prhs[]){ @@ -72,5 +72,5 @@ return(ochar); }/*}}}*/ -/*FUNCTION OptionStructParse {{{1*/ +/*FUNCTION OptionStructParse {{{*/ OptionStruct* OptionStructParse( char* name, const mxArray* prhs[]){ @@ -117,5 +117,5 @@ return(ostruct); }/*}}}*/ -/*FUNCTION OptionCellParse {{{1*/ +/*FUNCTION OptionCellParse {{{*/ OptionCell* OptionCellParse( char* name, const mxArray* prhs[]){ @@ -167,5 +167,5 @@ return(ocell); }/*}}}*/ -/*FUNCTION OptionParse{{{1*/ +/*FUNCTION OptionParse{{{*/ Option* OptionParse(char* name, const mxArray* prhs[]){ Index: /issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp =================================================================== --- /issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/matlab/io/WriteMatlabData.cpp (revision 12365) @@ -17,5 +17,5 @@ /*Primitive data types*/ -/*FUNCTION WriteData(mxArray** pdataref,double* matrix, int M,int N){{{1*/ +/*FUNCTION WriteData(mxArray** pdataref,double* matrix, int M,int N){{{*/ void WriteData(mxArray** pdataref,double* matrix, int M,int N){ @@ -42,5 +42,5 @@ } /*}}}*/ -/*FUNCTION WriteData(mxArray** pdataref,int* matrix, int M,int N){{{1*/ +/*FUNCTION WriteData(mxArray** pdataref,int* matrix, int M,int N){{{*/ void WriteData(mxArray** pdataref,int* matrix, int M,int N){ @@ -67,5 +67,5 @@ } /*}}}*/ -/*FUNCTION WriteData(mxArray** pdataref,double* vector, int M){{{1*/ +/*FUNCTION WriteData(mxArray** pdataref,double* vector, int M){{{*/ void WriteData(mxArray** pdataref,double* vector, int M){ @@ -90,5 +90,5 @@ } /*}}}*/ -/*FUNCTION WriteData(mxArray** pdataref,double scalar){{{1*/ +/*FUNCTION WriteData(mxArray** pdataref,double scalar){{{*/ void WriteData(mxArray** pdataref,double scalar){ @@ -96,5 +96,5 @@ } /*}}}*/ -/*FUNCTION WriteData(mxArray** pdataref,int integer){{{1*/ +/*FUNCTION WriteData(mxArray** pdataref,int integer){{{*/ void WriteData(mxArray** pdataref,int integer){ @@ -103,5 +103,5 @@ } /*}}}*/ -/*FUNCTION WriteData(mxArray** pdataref,int boolean){{{1*/ +/*FUNCTION WriteData(mxArray** pdataref,int boolean){{{*/ void WriteData(mxArray** pdataref,bool boolean){ @@ -110,5 +110,5 @@ } /*}}}*/ -/*FUNCTION WriteData(mxArray** pdataref,char* string){{{1*/ +/*FUNCTION WriteData(mxArray** pdataref,char* string){{{*/ void WriteData(mxArray** pdataref,char* string){ @@ -118,5 +118,5 @@ /*ISSM objects*/ -/*FUNCTION WriteData(mxArray** pdataref,BamgGeom* bamggeom){{{1*/ +/*FUNCTION WriteData(mxArray** pdataref,BamgGeom* bamggeom){{{*/ void WriteData(mxArray** pdataref,BamgGeom* bamggeom){ @@ -158,5 +158,5 @@ } /*}}}*/ -/*FUNCTION WriteData(mxArray** pdataref,BamgMesh* bamgmesh){{{1*/ +/*FUNCTION WriteData(mxArray** pdataref,BamgMesh* bamgmesh){{{*/ void WriteData(mxArray** pdataref,BamgMesh* bamgmesh){ @@ -216,5 +216,5 @@ } /*}}}*/ -/*FUNCTION WriteData(mxArray** pdataref,Matrix* matrix){{{1*/ +/*FUNCTION WriteData(mxArray** pdataref,Matrix* matrix){{{*/ void WriteData(mxArray** pdataref,Matrix* matrix){ @@ -259,5 +259,5 @@ } /*}}}*/ -/*FUNCTION WriteData(mxArray** pdataref,Vector* vector){{{1*/ +/*FUNCTION WriteData(mxArray** pdataref,Vector* vector){{{*/ void WriteData(mxArray** pdataref,Vector* vector){ @@ -296,5 +296,5 @@ /*Toolkit*/ -/*FUNCTION SetStructureField{{{1*/ +/*FUNCTION SetStructureField{{{*/ void SetStructureField(mxArray* dataref,const char* fieldname,int M,int N,double* fieldpointer){ Index: /issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/modules/Bamgx/Bamgx.cpp (revision 12365) @@ -38,5 +38,5 @@ /*If no mesh in input, generate one*/ if(bamgmesh_in->TrianglesSize[0]==0){ - /*Mesh generation {{{1*/ + /*Mesh generation {{{*/ //Step1: generate geometry Gh @@ -84,5 +84,5 @@ } else{ - /*Anisotropic mesh adaptation {{{1*/ + /*Anisotropic mesh adaptation {{{*/ // read background mesh Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (revision 12365) @@ -12,5 +12,5 @@ /*current module: */ -/*RiftIsPresent(Loads* loads,int configuration_type){{{1*/ +/*RiftIsPresent(Loads* loads,int configuration_type){{{*/ int RiftIsPresent(Loads* loads,int configuration_type){ @@ -41,5 +41,5 @@ } /*}}}*/ -/*RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){{{1*/ +/*RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){{{*/ void RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){ @@ -65,5 +65,5 @@ } /*}}}*/ -/*RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){{{1*/ +/*RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){{{*/ void RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){ @@ -106,5 +106,5 @@ } /*}}}*/ -/*RiftIsFrozen(Loads* loads,int configuration_type){{{1*/ +/*RiftIsFrozen(Loads* loads,int configuration_type){{{*/ int RiftIsFrozen(Loads* loads,int configuration_type){ @@ -144,5 +144,5 @@ } /*}}}*/ -/*RiftFreezeConstraints(Loads* loads,int configuration_type){{{1*/ +/*RiftFreezeConstraints(Loads* loads,int configuration_type){{{*/ void RiftFreezeConstraints(Loads* loads,int configuration_type){ @@ -172,5 +172,5 @@ /*diverse trials and errors: */ -/*RiftIsMaterialStable(Loads* loads){{{1*/ +/*RiftIsMaterialStable(Loads* loads){{{*/ int RiftIsMaterialStable(Loads* loads){ @@ -204,5 +204,5 @@ } /*}}}*/ -/*RiftIsPreStable(Loads* loads){{{1*/ +/*RiftIsPreStable(Loads* loads){{{*/ int RiftIsPreStable(Loads* loads){ @@ -243,5 +243,5 @@ } /*}}}*/ -/*RiftSetPreStable(Loads* loads){{{1*/ +/*RiftSetPreStable(Loads* loads){{{*/ void RiftSetPreStable(Loads* loads){ @@ -264,5 +264,5 @@ } /*}}}*/ -/*RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads){{{1*/ +/*RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads){{{*/ void RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads){ @@ -300,5 +300,5 @@ } /*}}}*/ -/*RiftMaxPenetrationInInputs(Loads* loads){{{1*/ +/*RiftMaxPenetrationInInputs(Loads* loads){{{*/ void RiftMaxPenetrationInInputs(Loads* loads){ @@ -342,5 +342,5 @@ } /*}}}*/ -/*RiftPotentialUnstableConstraints(Loads* loads){{{1*/ +/*RiftPotentialUnstableConstraints(Loads* loads){{{*/ int RiftPotentialUnstableConstraints(Loads* loads){ Index: /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (revision 12365) @@ -54,5 +54,5 @@ } -/*FUNCTION CreateNodesOnFloatingIce {{{1*/ +/*FUNCTION CreateNodesOnFloatingIce {{{*/ Vector* CreateNodesOnFloatingIce(Nodes* nodes,int configuration_type){ @@ -81,5 +81,5 @@ } /*%}}}*/ -/*FUNCTION PotentialSheetUngrounding {{{1*/ +/*FUNCTION PotentialSheetUngrounding {{{*/ double* PotentialSheetUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters){ @@ -108,5 +108,5 @@ } /*}}}*/ -/*FUNCTION PropagateFloatingiceToGroundedNeighbors {{{1*/ +/*FUNCTION PropagateFloatingiceToGroundedNeighbors {{{*/ double* PropagateFloatingiceToGroundedNeighbors(Elements* elements,Nodes* nodes,Vertices* vertices,Parameters* parameters,double* vertices_potentially_ungrounding){ Index: /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/modules/InterpFromGridToMeshx/InterpFromGridToMeshx.cpp (revision 12365) @@ -92,5 +92,5 @@ } /*}}}*/ -/*InterpFromGridToMeshxt {{{1*/ +/*InterpFromGridToMeshxt {{{*/ void* InterpFromGridToMeshxt(void* vpthread_handle){ @@ -183,5 +183,5 @@ }/*}}}*/ -/*findindices {{{1*/ +/*findindices {{{*/ bool findindices(int* pn,int* pm,double* x,int x_rows, double* y,int y_rows, double xgrid,double ygrid){ @@ -218,5 +218,5 @@ return (foundx && foundy); }/*}}}*/ -/*triangleinterp{{{1*/ +/*triangleinterp{{{*/ double triangleinterp(double x1,double x2,double y1,double y2,double Q11,double Q12,double Q21,double Q22,double x,double y){ /*split the rectangle in 2 triangle and @@ -259,5 +259,5 @@ } }/*}}}*/ -/*bilinearinterp{{{1*/ +/*bilinearinterp{{{*/ double bilinearinterp(double x1,double x2,double y1,double y2,double Q11,double Q12,double Q21,double Q22,double x,double y){ /*Bilinear interpolation: (http://en.wikipedia.org/wiki/Bilinear_interpolation) */ @@ -286,5 +286,5 @@ } /*}}}*/ -/*nearestinterp{{{1*/ +/*nearestinterp{{{*/ double nearestinterp(double x1,double x2,double y1,double y2,double Q11,double Q12,double Q21,double Q22,double x,double y){ /*Nearest neighbor interpolation*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 12365) @@ -15,5 +15,5 @@ void CreateParametersDakota(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type){ - /*variable declarations: {{{1*/ + /*variable declarations: {{{*/ int i,j,k; @@ -73,5 +73,5 @@ iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum); - /*name of qmu input, error and output files:{{{1*/ + /*name of qmu input, error and output files:{{{*/ qmuinname=(char*)xmalloc((strlen(name)+strlen(".qmu.in")+1)*sizeof(char)); sprintf(qmuinname,"%s%s",name,".qmu.in"); @@ -86,5 +86,5 @@ parameters->AddObject(new StringParam(QmuErrNameEnum,qmuerrname)); /*}}}*/ - /*Fetch variable descriptors: {{{1*/ + /*Fetch variable descriptors: {{{*/ iomodel->FetchData(&variabledescriptors,&numvariabledescriptors,QmuVariabledescriptorsEnum); @@ -93,5 +93,5 @@ /*}}}*/ - /*Fetch response descriptors: {{{1*/ + /*Fetch response descriptors: {{{*/ iomodel->FetchData(&responsedescriptors,&numresponsedescriptors,QmuResponsedescriptorsEnum); @@ -100,5 +100,5 @@ parameters->AddObject(new IntParam(QmuNumberofresponsesEnum,numberofresponses)); /*}}}*/ - /*Deal with partitioning: {{{1*/ + /*Deal with partitioning: {{{*/ /*partition vertices in iomodel->qmu_npart parts, unless a partition is already present: */ @@ -116,5 +116,5 @@ parameters->AddObject(new DoubleVecParam(QmuPartitionEnum,dpart,numberofvertices)); /*}}}*/ - /*Deal with data needed because of qmu variables: {{{1*/ + /*Deal with data needed because of qmu variables: {{{*/ for(i=0;iMaxNumDofs(configuration_type,GsetEnum); - /*Checks in debugging mode {{{1*/ + /*Checks in debugging mode {{{*/ if(penalty_kflag)_assert_(kflag); if(penalty_pflag)_assert_(pflag); Index: /issm/trunk-jpl/src/c/objects/Bamg/AdjacentTriangle.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/AdjacentTriangle.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/AdjacentTriangle.cpp (revision 12365) @@ -14,15 +14,15 @@ /*Methods*/ - /*FUNCTION AdjacentTriangle::Locked {{{1*/ + /*FUNCTION AdjacentTriangle::Locked {{{*/ int AdjacentTriangle::Locked() const { return t->AdjEdgeIndex[a] & 4; } /*}}}*/ - /*FUNCTION AdjacentTriangle::MarkUnSwap {{{1*/ + /*FUNCTION AdjacentTriangle::MarkUnSwap {{{*/ int AdjacentTriangle::MarkUnSwap() const { return t->AdjEdgeIndex[a] & 8; } /*}}}*/ - /*FUNCTION AdjacentTriangle::GetAllFlag_UnSwap {{{1*/ + /*FUNCTION AdjacentTriangle::GetAllFlag_UnSwap {{{*/ int AdjacentTriangle::GetAllFlag_UnSwap() const { // take all flag except MarkUnSwap @@ -30,35 +30,35 @@ } /*}}}*/ - /*FUNCTION AdjacentTriangle::SetLock {{{1*/ + /*FUNCTION AdjacentTriangle::SetLock {{{*/ void AdjacentTriangle::SetLock(){ t->SetLocked(a); } /*}}}*/ - /*FUNCTION AdjacentTriangle::Adj {{{1*/ + /*FUNCTION AdjacentTriangle::Adj {{{*/ AdjacentTriangle AdjacentTriangle::Adj() const { return t->Adj(a); } /*}}}*/ - /*FUNCTION AdjacentTriangle::EdgeVertex {{{1*/ + /*FUNCTION AdjacentTriangle::EdgeVertex {{{*/ BamgVertex* AdjacentTriangle::EdgeVertex(const int & i) const { return t->vertices[VerticesOfTriangularEdge[a][i]]; } /*}}}*/ - /*FUNCTION AdjacentTriangle::OppositeVertex {{{1*/ + /*FUNCTION AdjacentTriangle::OppositeVertex {{{*/ BamgVertex* AdjacentTriangle::OppositeVertex() const { return t->vertices[bamg::OppositeVertex[a]]; } /*}}}*/ - /*FUNCTION AdjacentTriangle::det {{{1*/ + /*FUNCTION AdjacentTriangle::det {{{*/ Icoor2 & AdjacentTriangle::det() const { return t->det; } /*}}}*/ - /*FUNCTION AdjacentTriangle::swap {{{1*/ + /*FUNCTION AdjacentTriangle::swap {{{*/ int AdjacentTriangle::swap(){ return t->swap(a); } /*}}}*/ - /*FUNCTION AdjacentTriangle::SetAdj2 {{{1*/ + /*FUNCTION AdjacentTriangle::SetAdj2 {{{*/ void AdjacentTriangle::SetAdj2(const AdjacentTriangle & ta, int l ){ //set Adjacent Triangle of a triangle Index: /issm/trunk-jpl/src/c/objects/Bamg/BamgGeom.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/BamgGeom.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/BamgGeom.cpp (revision 12365) @@ -5,5 +5,5 @@ /*Constructors/Destructors*/ -/*FUNCTION BamgGeom::BamgGeom(){{{1*/ +/*FUNCTION BamgGeom::BamgGeom(){{{*/ BamgGeom::BamgGeom(){ @@ -19,5 +19,5 @@ } /*}}}*/ -/*FUNCTION BamgGeom::~BamgGeom(){{{1*/ +/*FUNCTION BamgGeom::~BamgGeom(){{{*/ BamgGeom::~BamgGeom(){ Index: /issm/trunk-jpl/src/c/objects/Bamg/BamgMesh.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/BamgMesh.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/BamgMesh.cpp (revision 12365) @@ -5,5 +5,5 @@ /*Constructors/Destructors*/ -/*FUNCTION BamgMesh::BamgMesh(){{{1*/ +/*FUNCTION BamgMesh::BamgMesh(){{{*/ BamgMesh::BamgMesh(){ @@ -30,5 +30,5 @@ } /*}}}*/ -/*FUNCTION BamgMesh::~BamgMesh(){{{1*/ +/*FUNCTION BamgMesh::~BamgMesh(){{{*/ BamgMesh::~BamgMesh(){ Index: /issm/trunk-jpl/src/c/objects/Bamg/BamgOpts.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/BamgOpts.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/BamgOpts.cpp (revision 12365) @@ -6,5 +6,5 @@ /*Constructors/Destructors*/ -/*FUNCTION BamgOpts::BamgOpts() {{{1*/ +/*FUNCTION BamgOpts::BamgOpts() {{{*/ BamgOpts::BamgOpts(){ @@ -41,5 +41,5 @@ } /*}}}*/ -/*FUNCTION BamgOpts::~BamgOpts() {{{1*/ +/*FUNCTION BamgOpts::~BamgOpts() {{{*/ BamgOpts::~BamgOpts(){ @@ -55,5 +55,5 @@ /*Methods*/ -/*FUNCTION BamgOpts::Check{{{1*/ +/*FUNCTION BamgOpts::Check{{{*/ void BamgOpts::Check(void){ Index: /issm/trunk-jpl/src/c/objects/Bamg/BamgQuadtree.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/BamgQuadtree.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/BamgQuadtree.cpp (revision 12365) @@ -7,5 +7,5 @@ namespace bamg { - /*MACROS {{{1*/ + /*MACROS {{{*/ /* * @@ -48,5 +48,5 @@ #define J_IJ(k,l) ((k&2) ? l:0) /*}}}*/ - /*DOCUMENTATION What is a BamgQuadtree? {{{1 + /*DOCUMENTATION What is a BamgQuadtree? {{{ * A Quadtree is a very simple way to group vertices according * to their locations. A square that holds all the points of the mesh @@ -94,8 +94,8 @@ * Using binaries is therefore very easy to locate a vertex in a box: * we just need to look at the bits from the left to the right (See ::Add) - }}}1*/ + }}}*/ /*Constructors/Destructors*/ - /*FUNCTION BamgQuadtree::BamgQuadtree(){{{1*/ + /*FUNCTION BamgQuadtree::BamgQuadtree(){{{*/ BamgQuadtree::BamgQuadtree(){ @@ -111,6 +111,6 @@ } - /*}}}1*/ - /*FUNCTION BamgQuadtree::BamgQuadtree(Mesh * t,long nbv){{{1*/ + /*}}}*/ + /*FUNCTION BamgQuadtree::BamgQuadtree(Mesh * t,long nbv){{{*/ BamgQuadtree::BamgQuadtree(Mesh * t,long nbv){ @@ -133,14 +133,14 @@ } - /*}}}1*/ - /*FUNCTION BamgQuadtree::~BamgQuadtree(){{{1*/ + /*}}}*/ + /*FUNCTION BamgQuadtree::~BamgQuadtree(){{{*/ BamgQuadtree::~BamgQuadtree() { delete boxcontainer; root=NULL; } - /*}}}1*/ + /*}}}*/ /*Methods*/ - /*FUNCTION BamgQuadtree::Add{{{1*/ + /*FUNCTION BamgQuadtree::Add{{{*/ void BamgQuadtree::Add(BamgVertex &w){ /*Original code from Frederic Hecht (BAMG v1.01, BamgQuadtree.cpp/Add)*/ @@ -230,6 +230,6 @@ NbVertices++; } - /*}}}1*/ - /*FUNCTION BamgQuadtree::NearestVertex{{{1*/ + /*}}}*/ + /*FUNCTION BamgQuadtree::NearestVertex{{{*/ BamgVertex* BamgQuadtree::NearestVertex(Icoor1 i,Icoor1 j) { /*Original code from Frederic Hecht (BAMG v1.01, BamgQuadtree.cpp/NearestVertex)*/ @@ -389,6 +389,6 @@ } - /*}}}1*/ - /*FUNCTION BamgQuadtree::NearestVertexWithNormal{{{1*/ + /*}}}*/ + /*FUNCTION BamgQuadtree::NearestVertexWithNormal{{{*/ BamgVertex* BamgQuadtree::NearestVertexWithNormal(Icoor1 i,Icoor1 j) { /*Original code from Frederic Hecht (BAMG v1.01, BamgQuadtree.cpp/NearestVertexWithNormal)*/ @@ -497,6 +497,6 @@ return vn; } - /*}}}1*/ - /*FUNCTION BamgQuadtree::NewBamgQuadtreeBox {{{1*/ + /*}}}*/ + /*FUNCTION BamgQuadtree::NewBamgQuadtreeBox {{{*/ BamgQuadtree::BamgQuadtreeBox* BamgQuadtree::NewBamgQuadtreeBox(void){ @@ -521,5 +521,5 @@ return newbox; }/*}}}*/ - /*FUNCTION BamgQuadtree::ToClose {{{1*/ + /*FUNCTION BamgQuadtree::ToClose {{{*/ BamgVertex* BamgQuadtree::ToClose(BamgVertex & v,double seuil,Icoor1 hx,Icoor1 hy){ /*Original code from Frederic Hecht (BAMG v1.01, BamgQuadtree.cpp/ToClose)*/ @@ -595,4 +595,4 @@ return 0; } - /*}}}1*/ + /*}}}*/ } Index: /issm/trunk-jpl/src/c/objects/Bamg/BamgVertex.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/BamgVertex.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/BamgVertex.cpp (revision 12365) @@ -9,5 +9,5 @@ /*Methods*/ - /*FUNCTION BamgVertex::Echo {{{1*/ + /*FUNCTION BamgVertex::Echo {{{*/ void BamgVertex::Echo(void){ @@ -22,10 +22,10 @@ } /*}}}*/ - /*FUNCTION BamgVertex::GetReferenceNumber{{{1*/ + /*FUNCTION BamgVertex::GetReferenceNumber{{{*/ int BamgVertex::GetReferenceNumber() const { return ReferenceNumber; } /*}}}*/ - /*FUNCTION BamgVertex::MetricFromHessian{{{1*/ + /*FUNCTION BamgVertex::MetricFromHessian{{{*/ void BamgVertex::MetricFromHessian(const double Hxx,const double Hyx, const double Hyy,const double smin,const double smax,const double s,double err,BamgOpts* bamgopts){ /*Compute Metric from Hessian*/ @@ -105,6 +105,6 @@ } - /*}}}1*/ - /*FUNCTION BamgVertex::Optim {{{1*/ + /*}}}*/ + /*FUNCTION BamgVertex::Optim {{{*/ long BamgVertex::Optim(int i,int koption){ long ret=0; @@ -119,5 +119,5 @@ } /*}}}*/ - /*FUNCTION BamgVertex::Smoothing{{{1*/ + /*FUNCTION BamgVertex::Smoothing{{{*/ double BamgVertex::Smoothing(Mesh &Th,const Mesh &BTh,Triangle* &tstart ,double omega){ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Smoothing)*/ @@ -222,8 +222,8 @@ return delta; } - /*}}}1*/ + /*}}}*/ /*Intermediary*/ - /*FUNCTION QuadQuality{{{1*/ + /*FUNCTION QuadQuality{{{*/ double QuadQuality(const BamgVertex & a,const BamgVertex &b,const BamgVertex &c,const BamgVertex &d) { /*Original code from Frederic Hecht (BAMG v1.01, MeshQuad.cpp/QuadQuality)*/ @@ -252,5 +252,5 @@ return 1.0-Max(Max(Abs(cosDAB),Abs(cosABC)),Max(Abs(cosBCD),Abs(cosCDA))); } - /*}}}1*/ + /*}}}*/ } Index: /issm/trunk-jpl/src/c/objects/Bamg/CrackedEdge.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/CrackedEdge.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/CrackedEdge.cpp (revision 12365) @@ -9,5 +9,5 @@ /*Constructors/Destructors*/ - /*FUNCTION CrackedEdge() {{{1*/ + /*FUNCTION CrackedEdge() {{{*/ CrackedEdge::CrackedEdge() { a=NULL; Index: /issm/trunk-jpl/src/c/objects/Bamg/Curve.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/Curve.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/Curve.cpp (revision 12365) @@ -10,5 +10,5 @@ /*Constructors/Destructors*/ - /*FUNCTION Curve::Curve(){{{1*/ + /*FUNCTION Curve::Curve(){{{*/ Curve::Curve(){ FirstEdge=NULL; @@ -20,5 +20,5 @@ /*Methods*/ - /*FUNCTION Curve::Reverse {{{1*/ + /*FUNCTION Curve::Reverse {{{*/ void Curve::Reverse() { /*reverse the direction of the curve */ @@ -27,5 +27,5 @@ } /*}}}*/ - /*FUNCTION Curve::Set {{{1*/ + /*FUNCTION Curve::Set {{{*/ void Curve::Set(const Curve & rec,const Geometry & Gh ,Geometry & GhNew){ *this = rec; Index: /issm/trunk-jpl/src/c/objects/Bamg/Direction.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/Direction.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/Direction.cpp (revision 12365) @@ -9,10 +9,10 @@ /*Constructors/Destructors*/ - /*FUNCTION Direction() {{{1*/ + /*FUNCTION Direction() {{{*/ Direction::Direction(): dir(MaxICoor){ }/*}}}*/ - /*FUNCTION Direction(Icoor1 i,Icoor1 j) {{{1*/ + /*FUNCTION Direction(Icoor1 i,Icoor1 j) {{{*/ Direction::Direction(Icoor1 i,Icoor1 j) { Icoor2 n2 = 2*(Abs(i)+Abs(j)); @@ -23,5 +23,5 @@ /*Methods*/ - /*FUNCTION Direction::direction{{{1*/ + /*FUNCTION Direction::direction{{{*/ int Direction::direction(Icoor1 i,Icoor1 j) { int r =1; Index: /issm/trunk-jpl/src/c/objects/Bamg/Edge.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/Edge.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/Edge.cpp (revision 12365) @@ -13,5 +13,5 @@ /*Methods*/ - /*FUNCTION Edge::Set {{{1*/ + /*FUNCTION Edge::Set {{{*/ void Edge::Set(const Mesh & Th ,long i,Mesh & ThNew){ *this = Th.edges[i]; @@ -24,5 +24,5 @@ } /*}}}*/ - /*FUNCTION Edge::Echo {{{1*/ + /*FUNCTION Edge::Echo {{{*/ void Edge::Echo(void){ printf("Edge:\n"); @@ -33,5 +33,5 @@ } /*}}}*/ - /*FUNCTION Edge::Renumbering{{{1*/ + /*FUNCTION Edge::Renumbering{{{*/ void Edge::Renumbering(BamgVertex *vb,BamgVertex *ve, long *renu){ @@ -41,5 +41,5 @@ } /*}}}*/ - /*FUNCTION Edge::Intersection{{{1*/ + /*FUNCTION Edge::Intersection{{{*/ int Edge::Intersection(const Edge & e){ Index: /issm/trunk-jpl/src/c/objects/Bamg/EigenMetric.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/EigenMetric.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/EigenMetric.cpp (revision 12365) @@ -9,5 +9,5 @@ /*Constructor*/ - /*FUNCTION EigenMetric::EigenMetric(const Metric M){{{1*/ + /*FUNCTION EigenMetric::EigenMetric(const Metric M){{{*/ EigenMetric::EigenMetric(const Metric& M){ /*From a metric (a11,a21,a22), get eigen values lambda1 and lambda2 and one eigen vector v*/ @@ -88,6 +88,6 @@ } - /*}}}1*/ - /*FUNCTION EigenMetric::EigenMetric(double r1,double r2,const D2 vp1){{{1*/ + /*}}}*/ + /*FUNCTION EigenMetric::EigenMetric(double r1,double r2,const D2 vp1){{{*/ EigenMetric::EigenMetric(double r1,double r2,const D2& vp1): lambda1(r1),lambda2(r2),v(vp1){ @@ -95,21 +95,21 @@ /*Methods*/ - /*FUNCTION EigenMetric::Abs{{{1*/ + /*FUNCTION EigenMetric::Abs{{{*/ void EigenMetric::Abs(){ lambda1=bamg::Abs(lambda1),lambda2=bamg::Abs(lambda2); }/*}}}*/ - /*FUNCTION EigenMetric::Aniso{{{1*/ + /*FUNCTION EigenMetric::Aniso{{{*/ double EigenMetric::Aniso() const { return sqrt( Aniso2()); }/*}}}*/ - /*FUNCTION EigenMetric::Aniso2{{{1*/ + /*FUNCTION EigenMetric::Aniso2{{{*/ double EigenMetric::Aniso2() const { return lmax()/lmin(); }/*}}}*/ - /*FUNCTION EigenMetric::BoundAniso{{{1*/ + /*FUNCTION EigenMetric::BoundAniso{{{*/ void EigenMetric::BoundAniso(const double c){ BoundAniso2(1/(c*c)); }/*}}}*/ - /*FUNCTION EigenMetric::Echo {{{1*/ + /*FUNCTION EigenMetric::Echo {{{*/ void EigenMetric::Echo(void){ @@ -123,43 +123,43 @@ } /*}}}*/ - /*FUNCTION EigenMetric::hmin{{{1*/ + /*FUNCTION EigenMetric::hmin{{{*/ double EigenMetric::hmin() const { return sqrt(1/bamg::Max3(lambda1,lambda2,1e-30)); }/*}}}*/ - /*FUNCTION EigenMetric::hmax{{{1*/ + /*FUNCTION EigenMetric::hmax{{{*/ double EigenMetric::hmax() const { return sqrt(1/bamg::Max(bamg::Min(lambda1,lambda2),1e-30)); }/*}}}*/ - /*FUNCTION EigenMetric::Isotrope{{{1*/ + /*FUNCTION EigenMetric::Isotrope{{{*/ void EigenMetric::Isotrope() { lambda1=lambda2=bamg::Max(lambda1,lambda2); }/*}}}*/ - /*FUNCTION EigenMetric::lmax{{{1*/ + /*FUNCTION EigenMetric::lmax{{{*/ double EigenMetric::lmax() const { return bamg::Max3(lambda1,lambda2,1e-30); }/*}}}*/ - /*FUNCTION EigenMetric::lmin{{{1*/ + /*FUNCTION EigenMetric::lmin{{{*/ double EigenMetric::lmin() const { return bamg::Max(bamg::Min(lambda1,lambda2),1e-30); }/*}}}*/ - /*FUNCTION EigenMetric::Min{{{1*/ + /*FUNCTION EigenMetric::Min{{{*/ void EigenMetric::Min(double a) { lambda1=bamg::Min(a,lambda1); lambda2=bamg::Min(a,lambda2) ; }/*}}}*/ - /*FUNCTION EigenMetric::Max{{{1*/ + /*FUNCTION EigenMetric::Max{{{*/ void EigenMetric::Max(double a) { //change eigen values lambda1=bamg::Max(a,lambda1); lambda2=bamg::Max(a,lambda2) ; }/*}}}*/ - /*FUNCTION EigenMetric::Minh{{{1*/ + /*FUNCTION EigenMetric::Minh{{{*/ void EigenMetric::Minh(double h) { Min(1.0/(h*h)); }/*}}}*/ - /*FUNCTION EigenMetric::Maxh{{{1*/ + /*FUNCTION EigenMetric::Maxh{{{*/ void EigenMetric::Maxh(double h) { //Call Max function Max(1.0/(h*h)); }/*}}}*/ - /*FUNCTION EigenMetric::pow{{{1*/ + /*FUNCTION EigenMetric::pow{{{*/ void EigenMetric::pow(double p){ lambda1=::pow(lambda1,p);lambda2=::pow(lambda2,p); Index: /issm/trunk-jpl/src/c/objects/Bamg/GeomEdge.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/GeomEdge.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/GeomEdge.cpp (revision 12365) @@ -16,9 +16,9 @@ /*Methods*/ - /*FUNCTION GeomEdge::Cracked{{{1*/ + /*FUNCTION GeomEdge::Cracked{{{*/ int GeomEdge::Cracked() const { return type &1; }/*}}}*/ - /*FUNCTION GeomEdge::F{{{1*/ + /*FUNCTION GeomEdge::F{{{*/ R2 GeomEdge::F(double theta) const{ /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/F)*/ @@ -62,10 +62,10 @@ return A*ca + B*cb + tg[0]*cta + tg[1]*ctb; } - /*}}}1*/ - /*FUNCTION GeomEdge::Mark{{{1*/ + /*}}}*/ + /*FUNCTION GeomEdge::Mark{{{*/ int GeomEdge::Mark() const { return type &16; }/*}}}*/ - /*FUNCTION GeomEdge::R1tg{{{1*/ + /*FUNCTION GeomEdge::R1tg{{{*/ double GeomEdge::R1tg(double theta,R2 & t) const{ /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/R1tg)*/ @@ -138,10 +138,10 @@ else return 0; } - /*}}}1*/ - /*FUNCTION GeomEdge::Required{{{1*/ + /*}}}*/ + /*FUNCTION GeomEdge::Required{{{*/ int GeomEdge::Required() { return type &64; }/*}}}*/ - /*FUNCTION GeomEdge::Set {{{1*/ + /*FUNCTION GeomEdge::Set {{{*/ void GeomEdge::Set(const GeomEdge & rec,const Geometry & Gh ,Geometry & GhNew){ *this = rec; @@ -152,37 +152,37 @@ } /*}}}*/ - /*FUNCTION GeomEdge::SetCracked{{{1*/ + /*FUNCTION GeomEdge::SetCracked{{{*/ void GeomEdge::SetCracked() { type |= 1;/*=>1st digit to 1*/ }/*}}}*/ - /*FUNCTION GeomEdge::SetTgA{{{1*/ + /*FUNCTION GeomEdge::SetTgA{{{*/ void GeomEdge::SetTgA() { type |=4; /*=>2d digit to 1*/ }/*}}}*/ - /*FUNCTION GeomEdge::SetTgB{{{1*/ + /*FUNCTION GeomEdge::SetTgB{{{*/ void GeomEdge::SetTgB() { type |=8; /*=> 3d digit to 1*/ }/*}}}*/ - /*FUNCTION GeomEdge::SetMark{{{1*/ + /*FUNCTION GeomEdge::SetMark{{{*/ void GeomEdge::SetMark() { type |=16;/*=> 4th digiy to 1*/ }/*}}}*/ - /*FUNCTION GeomEdge::SetUnMark{{{1*/ + /*FUNCTION GeomEdge::SetUnMark{{{*/ void GeomEdge::SetUnMark() { type &= 1007 /* 1023-16 = 000111110111 => 4th digit to 0*/; }/*}}}*/ - /*FUNCTION GeomEdge::SetRequired{{{1*/ + /*FUNCTION GeomEdge::SetRequired{{{*/ void GeomEdge::SetRequired() { type |= 64;/*=>6th digit to 1*/ }/*}}}*/ - /*FUNCTION GeomEdge::Tg{{{1*/ + /*FUNCTION GeomEdge::Tg{{{*/ int GeomEdge::Tg(int i) const { return i==0 ? TgA() : TgB(); }/*}}}*/ - /*FUNCTION GeomEdge::TgA{{{1*/ + /*FUNCTION GeomEdge::TgA{{{*/ int GeomEdge::TgA() const { return type &4; }/*}}}*/ - /*FUNCTION GeomEdge::TgB{{{1*/ + /*FUNCTION GeomEdge::TgB{{{*/ int GeomEdge::TgB() const { return type &8; Index: /issm/trunk-jpl/src/c/objects/Bamg/GeomSubDomain.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/GeomSubDomain.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/GeomSubDomain.cpp (revision 12365) @@ -12,5 +12,5 @@ /*Methods*/ - /*FUNCTION GeomSubDomain::Set {{{1*/ + /*FUNCTION GeomSubDomain::Set {{{*/ void GeomSubDomain::Set(const GeomSubDomain & rec,const Geometry & Gh ,const Geometry & GhNew){ *this = rec; Index: /issm/trunk-jpl/src/c/objects/Bamg/GeomVertex.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/GeomVertex.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/GeomVertex.cpp (revision 12365) @@ -14,10 +14,10 @@ /*Methods*/ - /*FUNCTION GeomVertex::Corner {{{1*/ + /*FUNCTION GeomVertex::Corner {{{*/ int GeomVertex::Corner() const { return type & 4; } /*}}}*/ - /*FUNCTION GeomVertex::Required {{{1*/ + /*FUNCTION GeomVertex::Required {{{*/ int GeomVertex::Required()const { // a corner is required @@ -25,10 +25,10 @@ } /*}}}*/ - /*FUNCTION GeomVertex::SetCorner {{{1*/ + /*FUNCTION GeomVertex::SetCorner {{{*/ void GeomVertex::SetCorner(){ type |= 4; } /*}}}*/ - /*FUNCTION GeomVertex::SetRequired {{{1*/ + /*FUNCTION GeomVertex::SetRequired {{{*/ void GeomVertex::SetRequired(){ type |= 2; Index: /issm/trunk-jpl/src/c/objects/Bamg/Geometry.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/Geometry.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/Geometry.cpp (revision 12365) @@ -13,10 +13,10 @@ /*Constructors/Destructors*/ - /*FUNCTION Geometry::Geometry(){{{1*/ + /*FUNCTION Geometry::Geometry(){{{*/ Geometry::Geometry(){ Init(); } /*}}}*/ - /*FUNCTION Geometry::Geometry(BamgGeom* bamggeom, BamgOpts* bamgopts){{{1*/ + /*FUNCTION Geometry::Geometry(BamgGeom* bamggeom, BamgOpts* bamgopts){{{*/ Geometry::Geometry(BamgGeom* bamggeom, BamgOpts* bamgopts){ Init(); @@ -25,5 +25,5 @@ } /*}}}*/ - /*FUNCTION Geometry::Geometry(const Geometry & Gh) (COPY operator){{{1*/ + /*FUNCTION Geometry::Geometry(const Geometry & Gh) (COPY operator){{{*/ Geometry::Geometry(const Geometry & Gh) { /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/Geometry)*/ @@ -44,6 +44,6 @@ subdomains[i].Set(Gh.subdomains[i],Gh,*this); } - /*}}}1*/ - /*FUNCTION Geometry::~Geometry(){{{1*/ + /*}}}*/ + /*FUNCTION Geometry::~Geometry(){{{*/ Geometry::~Geometry() { /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/~Geometry)*/ @@ -56,8 +56,8 @@ Init(); } - /*}}}1*/ + /*}}}*/ /*IO*/ - /*FUNCTION Geometry::ReadGeometry{{{1*/ + /*FUNCTION Geometry::ReadGeometry{{{*/ void Geometry::ReadGeometry(BamgGeom* bamggeom,BamgOpts* bamgopts){ @@ -279,6 +279,6 @@ } } - /*}}}1*/ - /*FUNCTION Geometry::WriteGeometry{{{1*/ + /*}}}*/ + /*FUNCTION Geometry::WriteGeometry{{{*/ void Geometry::WriteGeometry(BamgGeom* bamggeom, BamgOpts* bamgopts){ @@ -397,8 +397,8 @@ } } - /*}}}1*/ + /*}}}*/ /*Methods*/ - /*FUNCTION Geometry::Echo {{{1*/ + /*FUNCTION Geometry::Echo {{{*/ void Geometry::Echo(void){ @@ -421,5 +421,5 @@ } /*}}}*/ - /*FUNCTION Geometry::Init{{{1*/ + /*FUNCTION Geometry::Init{{{*/ void Geometry::Init(void){ /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/EmptyGeometry)*/ @@ -437,6 +437,6 @@ MaxCornerAngle = 10*Pi/180; //default is 10 degres } - /*}}}1*/ - /*FUNCTION Geometry::MinimalHmin{{{1*/ + /*}}}*/ + /*FUNCTION Geometry::MinimalHmin{{{*/ double Geometry::MinimalHmin() { /* coeffIcoor = (2^30-1)/D @@ -445,29 +445,29 @@ return 2.0/coefIcoor; }/*}}}*/ - /*FUNCTION Geometry::MaximalHmax{{{1*/ + /*FUNCTION Geometry::MaximalHmax{{{*/ double Geometry::MaximalHmax() { return Max(pmax.x-pmin.x,pmax.y-pmin.y); }/*}}}*/ - /*FUNCTION Geometry::GetId(const GeomVertex &t){{{1*/ + /*FUNCTION Geometry::GetId(const GeomVertex &t){{{*/ long Geometry::GetId(const GeomVertex & t) const { return &t - vertices; }/*}}}*/ - /*FUNCTION Geometry::GetId(const GeomVertex * t){{{1*/ + /*FUNCTION Geometry::GetId(const GeomVertex * t){{{*/ long Geometry::GetId(const GeomVertex * t) const { return t - vertices; }/*}}}*/ - /*FUNCTION Geometry::GetId(const GeomEdge & t){{{1*/ + /*FUNCTION Geometry::GetId(const GeomEdge & t){{{*/ long Geometry::GetId(const GeomEdge & t) const { return &t - edges; }/*}}}*/ - /*FUNCTION Geometry::GetId(const GeomEdge * t){{{1*/ + /*FUNCTION Geometry::GetId(const GeomEdge * t){{{*/ long Geometry::GetId(const GeomEdge * t) const { return t - edges; }/*}}}*/ - /*FUNCTION Geometry::GetId(const Curve * c){{{1*/ + /*FUNCTION Geometry::GetId(const Curve * c){{{*/ long Geometry::GetId(const Curve * c) const { return c - curves; }/*}}}*/ - /*FUNCTION Geometry::Containing{{{1*/ + /*FUNCTION Geometry::Containing{{{*/ GeomEdge* Geometry::Containing(const R2 P, GeomEdge * start) const { /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/Contening)*/ @@ -494,6 +494,6 @@ return on; } - /*}}}1*/ - /*FUNCTION Geometry::PostRead{{{1*/ + /*}}}*/ + /*FUNCTION Geometry::PostRead{{{*/ void Geometry::PostRead(){ /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/AfterRead)*/ @@ -817,6 +817,6 @@ } - /*}}}1*/ - /*FUNCTION Geometry::ProjectOnCurve {{{1*/ + /*}}}*/ + /*FUNCTION Geometry::ProjectOnCurve {{{*/ GeomEdge* Geometry::ProjectOnCurve(const Edge &e,double s,BamgVertex &V,VertexOnGeom &GV) const { /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/ProjectOnCurve)*/ @@ -951,6 +951,6 @@ return on; } - /*}}}1*/ - /*FUNCTION Geometry::R2ToI2{{{1*/ + /*}}}*/ + /*FUNCTION Geometry::R2ToI2{{{*/ I2 Geometry::R2ToI2(const R2 & P) const { /*coefIcoor is the coefficient used for integer coordinates: @@ -965,5 +965,5 @@ return I2( (Icoor1) (coefIcoor*(P.x-pmin.x)) ,(Icoor1) (coefIcoor*(P.y-pmin.y)) ); }/*}}}*/ - /*FUNCTION Geometry::UnMarkEdges{{{1*/ + /*FUNCTION Geometry::UnMarkEdges{{{*/ void Geometry::UnMarkEdges() { for (int i=0;i (BAMG v1.01, Mesh2.cpp/Length)*/ @@ -77,6 +77,6 @@ return s; } - /*}}}1*/ - /*FUNCTION ListofIntersectionTriangles::NewItem(Triangle * tt,double d0,double d1,double d2) {{{1*/ + /*}}}*/ + /*FUNCTION ListofIntersectionTriangles::NewItem(Triangle * tt,double d0,double d1,double d2) {{{*/ int ListofIntersectionTriangles::NewItem(Triangle * tt,double d0,double d1,double d2) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NewItem)*/ @@ -105,6 +105,6 @@ return n; } - /*}}}1*/ - /*FUNCTION ListofIntersectionTriangles::NewItem(R2 A,const Metric & mm){{{1*/ + /*}}}*/ + /*FUNCTION ListofIntersectionTriangles::NewItem(R2 A,const Metric & mm){{{*/ int ListofIntersectionTriangles::NewItem(R2 A,const Metric & mm) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NewItem)*/ @@ -121,6 +121,6 @@ return n; } - /*}}}1*/ - /*FUNCTION ListofIntersectionTriangles::NewPoints{{{1*/ + /*}}}*/ + /*FUNCTION ListofIntersectionTriangles::NewPoints{{{*/ long ListofIntersectionTriangles::NewPoints(BamgVertex* vertices,long &nbv,long maxnbv){ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NewPoints)*/ @@ -178,6 +178,6 @@ return nbv-nbvold; } - /*}}}1*/ - /*FUNCTION ListofIntersectionTriangles::NewSubSeg{{{1*/ + /*}}}*/ + /*FUNCTION ListofIntersectionTriangles::NewSubSeg{{{*/ void ListofIntersectionTriangles::NewSubSeg(GeomEdge *e,double s0,double s1){ long int verbosity=0; @@ -201,5 +201,5 @@ } /*}}}*/ - /*FUNCTION ListofIntersectionTriangles::ReShape{{{1*/ + /*FUNCTION ListofIntersectionTriangles::ReShape{{{*/ void ListofIntersectionTriangles::ReShape(){ @@ -217,5 +217,5 @@ } /*}}}*/ - /*FUNCTION ListofIntersectionTriangles::SplitEdge{{{1*/ + /*FUNCTION ListofIntersectionTriangles::SplitEdge{{{*/ void ListofIntersectionTriangles::SplitEdge(const Mesh & Bh, const R2 &A,const R2 &B,int nbegin) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ListofIntersectionTriangles)*/ @@ -421,5 +421,5 @@ } // for(;;) } - /*}}}1*/ + /*}}}*/ } Index: /issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/Mesh.cpp (revision 12365) @@ -11,5 +11,5 @@ /*Constructors/Destructors*/ - /*FUNCTION Mesh::Mesh(BamgGeom* bamggeom,BamgMesh* bamgmesh, BamgOpts* bamgopts){{{1*/ + /*FUNCTION Mesh::Mesh(BamgGeom* bamggeom,BamgMesh* bamgmesh, BamgOpts* bamgopts){{{*/ Mesh::Mesh(BamgGeom* bamggeom,BamgMesh* bamgmesh, BamgOpts* bamgopts):Gh(*(new Geometry())),BTh(*this){ @@ -40,6 +40,6 @@ ReconstructExistingMesh(); } - /*}}}1*/ - /*FUNCTION Mesh::Mesh(double* index,double* x,double* y,int nods,int nels){{{1*/ + /*}}}*/ + /*FUNCTION Mesh::Mesh(double* index,double* x,double* y,int nods,int nels){{{*/ Mesh::Mesh(double* index,double* x,double* y,int nods,int nels):Gh(*(new Geometry())),BTh(*this){ @@ -49,11 +49,11 @@ ReconstructExistingMesh(); } - /*}}}1*/ - /*FUNCTION Mesh::Mesh(double* x,double* y,int nods){{{1*/ + /*}}}*/ + /*FUNCTION Mesh::Mesh(double* x,double* y,int nods){{{*/ Mesh::Mesh(double* x,double* y,int nods):Gh(*(new Geometry())),BTh(*this){ Triangulate(x,y,nods); } - /*}}}1*/ - /*FUNCTION Mesh::Mesh(const Mesh & Tho,const int *flag ,const int *bb){{{1*/ + /*}}}*/ + /*FUNCTION Mesh::Mesh(const Mesh & Tho,const int *flag ,const int *bb){{{*/ Mesh::Mesh(const Mesh & Tho,const int *flag ,const int *bb,BamgOpts* bamgopts) : Gh(*(new Geometry())), BTh(*this) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Triangles)*/ @@ -160,6 +160,6 @@ } - /*}}}1*/ - /*FUNCTION Mesh::Mesh(Mesh & Th,Geometry * pGh,Mesh * pBth,long maxnbv_in) COPY{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::Mesh(Mesh & Th,Geometry * pGh,Mesh * pBth,long maxnbv_in) COPY{{{*/ Mesh::Mesh(Mesh & Th,Geometry * pGh,Mesh * pBth,long maxnbv_in) : Gh(*(pGh?pGh:&Th.Gh)), BTh(*(pBth?pBth:this)) { @@ -224,18 +224,18 @@ } - /*}}}1*/ - /*FUNCTION Mesh::Mesh(long maxnbv,Mesh & BT,BamgOpts* bamgopts,int keepBackVertices){{{1*/ + /*}}}*/ + /*FUNCTION Mesh::Mesh(long maxnbv,Mesh & BT,BamgOpts* bamgopts,int keepBackVertices){{{*/ Mesh::Mesh(long imaxnbv,Mesh & BT,BamgOpts* bamgopts,int keepBackVertices) :Gh(BT.Gh),BTh(BT) { this->Init(imaxnbv); TriangulateFromGeom1(bamgopts,keepBackVertices); } - /*}}}1*/ - /*FUNCTION Mesh::Mesh(long maxnbv,Geometry & G,BamgOpts* bamgopts){{{1*/ + /*}}}*/ + /*FUNCTION Mesh::Mesh(long maxnbv,Geometry & G,BamgOpts* bamgopts){{{*/ Mesh::Mesh(long imaxnbv,Geometry & G,BamgOpts* bamgopts):Gh(G),BTh(*this){ Init(imaxnbv); TriangulateFromGeom0(bamgopts); } - /*}}}1*/ - /*FUNCTION Mesh::~Mesh(){{{1*/ + /*}}}*/ + /*FUNCTION Mesh::~Mesh(){{{*/ Mesh::~Mesh() { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Triangles)*/ @@ -262,8 +262,8 @@ Init(0); // set all to zero } - /*}}}1*/ + /*}}}*/ /*IO*/ - /*FUNCTION Mesh::ReadMesh(double* index,double* x,double* y,int nods,int nels){{{1*/ + /*FUNCTION Mesh::ReadMesh(double* index,double* x,double* y,int nods,int nels){{{*/ void Mesh::ReadMesh(double* index,double* x,double* y,int nods,int nels){ @@ -328,6 +328,6 @@ xfree((void**)&nodeflags); } - /*}}}1*/ - /*FUNCTION Mesh::ReadMesh(BamgMesh* bamgmesh, BamgOpts* bamgopts){{{1*/ + /*}}}*/ + /*FUNCTION Mesh::ReadMesh(BamgMesh* bamgmesh, BamgOpts* bamgopts){{{*/ void Mesh::ReadMesh(BamgMesh* bamgmesh, BamgOpts* bamgopts){ @@ -529,6 +529,6 @@ } - /*}}}1*/ - /*FUNCTION Mesh::WriteMesh {{{1*/ + /*}}}*/ + /*FUNCTION Mesh::WriteMesh {{{*/ void Mesh::WriteMesh(BamgMesh* bamgmesh,BamgOpts* bamgopts){ @@ -954,6 +954,6 @@ delete [] numt; } - /*}}}1*/ - /*FUNCTION Mesh::ReadMetric{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::ReadMetric{{{*/ void Mesh::ReadMetric(const BamgOpts* bamgopts) { @@ -992,6 +992,6 @@ } } - /*}}}1*/ - /*FUNCTION Mesh::WriteMetric{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::WriteMetric{{{*/ void Mesh::WriteMetric(BamgOpts* bamgopts) { int i; @@ -1004,6 +1004,6 @@ } } - /*}}}1*/ - /*FUNCTION Mesh::WriteIndex{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::WriteIndex{{{*/ void Mesh::WriteIndex(int** pindex,int* pnels){ @@ -1042,8 +1042,8 @@ *pnels=num; } - /*}}}1*/ + /*}}}*/ /*Methods*/ - /*FUNCTION Mesh::AddGeometryMetric{{{1*/ + /*FUNCTION Mesh::AddGeometryMetric{{{*/ void Mesh::AddGeometryMetric(BamgOpts* bamgopts){ /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/IntersectGeomMetric)*/ @@ -1099,6 +1099,6 @@ // the problem is for the vertex on vertex } - /*}}}1*/ - /*FUNCTION Mesh::AddMetric{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::AddMetric{{{*/ void Mesh::AddMetric(BamgOpts* bamgopts){ // Hessiantype = 0 => H is computed using double P2 projection @@ -1118,6 +1118,6 @@ } } - /*}}}1*/ - /*FUNCTION Mesh::AddVertex{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::AddVertex{{{*/ void Mesh::AddVertex( BamgVertex &s,Triangle* t, Icoor2* det3) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Add)*/ @@ -1255,6 +1255,6 @@ } } - /*}}}1*/ - /*FUNCTION Mesh::BoundAnisotropy{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::BoundAnisotropy{{{*/ void Mesh::BoundAnisotropy(double anisomax,double hminaniso) { /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/BoundAnisotropy)*/ @@ -1295,6 +1295,6 @@ } } - /*}}}1*/ - /*FUNCTION Mesh::BuildGeometryFromMesh{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::BuildGeometryFromMesh{{{*/ void Mesh::BuildGeometryFromMesh(BamgOpts* bamgopts){ /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/ConsGeometry)*/ @@ -1748,6 +1748,6 @@ } - /*}}}1*/ - /*FUNCTION Mesh::BuildMetric0 (double P2 projection){{{1*/ + /*}}}*/ + /*FUNCTION Mesh::BuildMetric0 (double P2 projection){{{*/ void Mesh::BuildMetric0(BamgOpts* bamgopts){ @@ -1953,6 +1953,6 @@ delete [] dydy_vertex; } - /*}}}1*/ - /*FUNCTION Mesh::BuildMetric1 (Green formula){{{1*/ + /*}}}*/ + /*FUNCTION Mesh::BuildMetric1 (Green formula){{{*/ void Mesh::BuildMetric1(BamgOpts* bamgopts){ /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/IntersectConsMetric)*/ @@ -2244,6 +2244,6 @@ } - /*}}}1*/ - /*FUNCTION Mesh::CrackMesh{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::CrackMesh{{{*/ void Mesh::CrackMesh(BamgOpts* bamgopts) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/CrackMesh)*/ @@ -2392,6 +2392,6 @@ } - /*}}}1*/ - /*FUNCTION Mesh::Echo{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::Echo{{{*/ void Mesh::Echo(void) { @@ -2416,6 +2416,6 @@ } - /*}}}1*/ - /*FUNCTION Mesh::ForceBoundary{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::ForceBoundary{{{*/ void Mesh::ForceBoundary() { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ForceBoundary)*/ @@ -2459,6 +2459,6 @@ if (verbose > 3) printf(" number of inforced edge = %i, number of swap= %i\n",nbfe,Nbswap); } - /*}}}1*/ - /*FUNCTION Mesh::FindSubDomain{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::FindSubDomain{{{*/ void Mesh::FindSubDomain(int OutSide) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/FindSubDomain)*/ @@ -2707,36 +2707,36 @@ if(!triangles[it].link) nbtout++; } - /*}}}1*/ - /*FUNCTION Mesh::GetId(const Triangle & t) const{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::GetId(const Triangle & t) const{{{*/ long Mesh::GetId(const Triangle & t) const { return &t - triangles; } - /*}}}1*/ - /*FUNCTION Mesh::GetId(const Triangle * t) const{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::GetId(const Triangle * t) const{{{*/ long Mesh::GetId(const Triangle * t) const { return t - triangles; } - /*}}}1*/ - /*FUNCTION Mesh::GetId(const BamgVertex & t) const{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::GetId(const BamgVertex & t) const{{{*/ long Mesh::GetId(const BamgVertex & t) const { return &t - vertices; } - /*}}}1*/ - /*FUNCTION Mesh::GetId(const BamgVertex * t) const{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::GetId(const BamgVertex * t) const{{{*/ long Mesh::GetId(const BamgVertex * t) const { return t - vertices; } - /*}}}1*/ - /*FUNCTION Mesh::GetId(const Edge & t) const{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::GetId(const Edge & t) const{{{*/ long Mesh::GetId(const Edge & t) const { return &t - edges; } - /*}}}1*/ - /*FUNCTION Mesh::GetId(const Edge * t) const{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::GetId(const Edge * t) const{{{*/ long Mesh::GetId(const Edge * t) const { return t - edges; } - /*}}}1*/ - /*FUNCTION Mesh::Init{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::Init{{{*/ void Mesh::Init(long maxnbv_in) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/PreInit)*/ @@ -2786,6 +2786,6 @@ } } - /*}}}1*/ - /*FUNCTION Mesh::Insert{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::Insert{{{*/ void Mesh::Insert() { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Insert)*/ @@ -2938,6 +2938,6 @@ #endif } - /*}}}1*/ - /*FUNCTION Mesh::InsertNewPoints{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::InsertNewPoints{{{*/ long Mesh::InsertNewPoints(long nbvold,long & NbTSwap) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/InsertNewPoints)*/ @@ -3015,11 +3015,11 @@ return nbv-nbvold; } - /*}}}1*/ - /*FUNCTION Mesh::isCracked{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::isCracked{{{*/ int Mesh::isCracked() const { return NbCrackedVertices != 0; } - /*}}}1*/ - /*FUNCTION Mesh::MakeGeomEdgeToEdge{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::MakeGeomEdgeToEdge{{{*/ Edge** Mesh::MakeGeomEdgeToEdge() { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/MakeGeomEdgeToEdge)*/ @@ -3063,6 +3063,6 @@ return e; } - /*}}}1*/ - /*FUNCTION Mesh::MakeQuadrangles{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::MakeQuadrangles{{{*/ void Mesh::MakeQuadrangles(double costheta){ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/MakeQuadrangles)*/ @@ -3106,6 +3106,6 @@ delete [] qq; } - /*}}}1*/ - /*FUNCTION Mesh::MakeBamgQuadtree{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::MakeBamgQuadtree{{{*/ void Mesh::MakeBamgQuadtree() { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/MakeBamgQuadtree)*/ @@ -3115,11 +3115,11 @@ } - /*}}}1*/ - /*FUNCTION Mesh::MaxinalHmax{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::MaxinalHmax{{{*/ double Mesh::MaximalHmax() { return Max(pmax.x-pmin.x,pmax.y-pmin.y); } - /*}}}1*/ - /*FUNCTION Mesh::MaxSubDivision{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::MaxSubDivision{{{*/ void Mesh::MaxSubDivision(double maxsubdiv) { /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/MaxSubDivision)*/ @@ -3174,6 +3174,6 @@ } } - /*}}}1*/ - /*FUNCTION Mesh::MetricAt{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::MetricAt{{{*/ Metric Mesh::MetricAt(const R2 & A) const { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/MetricAt)*/ @@ -3195,17 +3195,17 @@ } } - /*}}}1*/ - /*FUNCTION Mesh::MininalHmin{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::MininalHmin{{{*/ double Mesh::MinimalHmin() { return 2.0/coefIcoor; } - /*}}}1*/ -/*FUNCTION Mesh::NearestVertex{{{1*/ + /*}}}*/ +/*FUNCTION Mesh::NearestVertex{{{*/ BamgVertex* Mesh::NearestVertex(Icoor1 i,Icoor1 j) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NearestVertex)*/ return quadtree->NearestVertex(i,j); } -/*}}}1*/ - /*FUNCTION Mesh::NewPoints{{{1*/ +/*}}}*/ + /*FUNCTION Mesh::NewPoints{{{*/ void Mesh::NewPoints(Mesh & Bh,BamgOpts* bamgopts,int KeepVertices){ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NewPoints)*/ @@ -3326,6 +3326,6 @@ NbTSwap += NbSwapf ; } - /*}}}1*/ - /*FUNCTION Mesh::ProjectOnCurve{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::ProjectOnCurve{{{*/ GeomEdge* Mesh::ProjectOnCurve( Edge & BhAB, BamgVertex & vA, BamgVertex & vB, double theta,BamgVertex & R,VertexOnEdge & BR,VertexOnGeom & GR) { @@ -3455,6 +3455,6 @@ return 0; // just for the compiler } - /*}}}1*/ -/*FUNCTION Mesh::ReconstructExistingMesh{{{1*/ + /*}}}*/ +/*FUNCTION Mesh::ReconstructExistingMesh{{{*/ void Mesh::ReconstructExistingMesh(){ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/FillHoleInMesh)*/ @@ -3762,6 +3762,6 @@ } } -/*}}}1*/ - /*FUNCTION Mesh::TrianglesRenumberBySubDomain{{{1*/ +/*}}}*/ + /*FUNCTION Mesh::TrianglesRenumberBySubDomain{{{*/ void Mesh::TrianglesRenumberBySubDomain(bool justcompress){ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ReNumberingTheTriangleBySubDomain)*/ @@ -3831,6 +3831,6 @@ } - /*}}}1*/ - /*FUNCTION Mesh::VerticesRenumber{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::VerticesRenumber{{{*/ void Mesh::VerticesRenumber(long * renu) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ReNumberingVertex)*/ @@ -3905,6 +3905,6 @@ for ( it=0;it (BAMG v1.01, Mesh2.cpp/SetIntCoor)*/ @@ -3967,6 +3967,6 @@ if (number_of_errors) _error_("Fatal error: some triangles have negative areas, see above"); } -/*}}}1*/ -/*FUNCTION Mesh::ShowRegulaty{{{1*/ +/*}}}*/ +/*FUNCTION Mesh::ShowRegulaty{{{*/ void Mesh::ShowRegulaty() const { /*Original code from Frederic Hecht */ @@ -4031,6 +4031,6 @@ printf(" anisomax = %g, beta max = %g, min = %g\n",pow(alpha2,0.5),1./pow(beta/aireKh,0.5), 1./pow(beta0/aireKh,0.5)); } -/*}}}1*/ -/*FUNCTION Mesh::ShowHistogram{{{1*/ +/*}}}*/ +/*FUNCTION Mesh::ShowHistogram{{{*/ void Mesh::ShowHistogram() const { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ShowHistogram)*/ @@ -4076,6 +4076,6 @@ printf(" --------------------+-------------+-------------\n"); } -/*}}}1*/ -/*FUNCTION Mesh::SmoothingVertex{{{1*/ +/*}}}*/ +/*FUNCTION Mesh::SmoothingVertex{{{*/ void Mesh::SmoothingVertex(int nbiter,double omega ) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/SmoothingVertex)*/ @@ -4118,6 +4118,6 @@ if (quadtree) quadtree= new BamgQuadtree(this); } -/*}}}1*/ -/*FUNCTION Mesh::SmoothMetric{{{1*/ +/*}}}*/ +/*FUNCTION Mesh::SmoothMetric{{{*/ void Mesh::SmoothMetric(double raisonmax) { /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/SmoothMetric)*/ @@ -4196,6 +4196,6 @@ delete [] first_np_or_next_t1; } -/*}}}1*/ - /*FUNCTION Mesh::SplitElement{{{1*/ +/*}}}*/ + /*FUNCTION Mesh::SplitElement{{{*/ int Mesh::SplitElement(int choice){ /*Original code from Frederic Hecht (BAMG v1.01, MeshQuad.cpp/SplitElement)*/ @@ -4706,6 +4706,6 @@ return ret; // ok } - /*}}}1*/ -/*FUNCTION Mesh::SplitInternalEdgeWithBorderVertices{{{1*/ + /*}}}*/ +/*FUNCTION Mesh::SplitInternalEdgeWithBorderVertices{{{*/ long Mesh::SplitInternalEdgeWithBorderVertices(){ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/SplitInternalEdgeWithBorderVertices)*/ @@ -4777,16 +4777,16 @@ return NbSplitEdge; } -/*}}}1*/ -/*FUNCTION Mesh::ToI2{{{1*/ +/*}}}*/ +/*FUNCTION Mesh::ToI2{{{*/ I2 Mesh::R2ToI2(const R2 & P) const { return I2( (Icoor1) (coefIcoor*(P.x-pmin.x)),(Icoor1) (coefIcoor*(P.y-pmin.y)) ); } -/*}}}1*/ -/*FUNCTION Mesh::ToR2{{{1*/ +/*}}}*/ +/*FUNCTION Mesh::ToR2{{{*/ R2 Mesh::I2ToR2(const I2 & P) const { return R2( (double) P.x/coefIcoor+pmin.x, (double) P.y/coefIcoor+pmin.y); } -/*}}}1*/ -/*FUNCTION Mesh::TriangleFindFromCoord{{{1*/ +/*}}}*/ +/*FUNCTION Mesh::TriangleFindFromCoord{{{*/ Triangle * Mesh::TriangleFindFromCoord(const I2 & B,Icoor2 det3[3], Triangle *tstart) const { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/FindTriangleContening)*/ @@ -4879,6 +4879,6 @@ return t; } -/*}}}1*/ -/*FUNCTION Mesh::TriangleIntNumbering{{{1*/ +/*}}}*/ +/*FUNCTION Mesh::TriangleIntNumbering{{{*/ void Mesh::TriangleIntNumbering(long* renumbering){ @@ -4890,6 +4890,6 @@ return; } -/*}}}1*/ -/*FUNCTION Mesh::TriangleReferenceList{{{1*/ +/*}}}*/ +/*FUNCTION Mesh::TriangleReferenceList{{{*/ long Mesh::TriangleReferenceList(long* reft) const { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ConsRefTriangle)*/ @@ -4930,6 +4930,6 @@ return k; } -/*}}}1*/ -/*FUNCTION Mesh::Triangulate{{{1*/ +/*}}}*/ +/*FUNCTION Mesh::Triangulate{{{*/ void Mesh::Triangulate(double* x,double* y,int nods){ @@ -4957,6 +4957,6 @@ Insert(); } -/*}}}1*/ - /*FUNCTION Mesh::TriangulateFromGeom0{{{1*/ +/*}}}*/ + /*FUNCTION Mesh::TriangulateFromGeom0{{{*/ void Mesh::TriangulateFromGeom0(BamgOpts* bamgopts){ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/GeomToTriangles0)*/ @@ -5272,6 +5272,6 @@ if (verbose>4) printf(" -- current number of vertices = %i\n",nbv); } - /*}}}1*/ - /*FUNCTION Mesh::TriangulateFromGeom1{{{1*/ + /*}}}*/ + /*FUNCTION Mesh::TriangulateFromGeom1{{{*/ void Mesh::TriangulateFromGeom1(BamgOpts* bamgopts,int KeepVertices){ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/GeomToTriangles1)*/ @@ -5602,8 +5602,8 @@ if (verbose>4) printf(" -- current number of vertices = %i\n",nbv); } - /*}}}1*/ + /*}}}*/ /*Intermediary*/ - /*FUNCTION CloseBoundaryEdge{{{1*/ + /*FUNCTION CloseBoundaryEdge{{{*/ AdjacentTriangle CloseBoundaryEdge(I2 A,Triangle *t, double &a,double &b) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/CloseBoundaryEdge)*/ @@ -5644,6 +5644,6 @@ } } - /*}}}1*/ - /*FUNCTION CloseBoundaryEdgeV2{{{1*/ + /*}}}*/ + /*FUNCTION CloseBoundaryEdgeV2{{{*/ AdjacentTriangle CloseBoundaryEdgeV2(I2 C,Triangle *t, double &a,double &b) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/CloseBoundaryEdgeV2)*/ @@ -5793,6 +5793,6 @@ return er; } - /*}}}1*/ -/*FUNCTION ForceEdge{{{1*/ + /*}}}*/ +/*FUNCTION ForceEdge{{{*/ int ForceEdge(BamgVertex &a, BamgVertex & b,AdjacentTriangle & taret) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ForceEdge)*/ @@ -5869,6 +5869,6 @@ return NbSwap; } -/*}}}1*/ -/*FUNCTION swap{{{1*/ +/*}}}*/ +/*FUNCTION swap{{{*/ void swap(Triangle *t1,short a1, Triangle *t2,short a2, BamgVertex *s1,BamgVertex *s2,Icoor2 det1,Icoor2 det2){ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/swap)*/ @@ -5914,6 +5914,6 @@ t2->SetSingleVertexToTriangleConnectivity(); } // end swap -/*}}}1*/ - /*FUNCTION SwapForForcingEdge{{{1*/ +/*}}}*/ + /*FUNCTION SwapForForcingEdge{{{*/ int SwapForForcingEdge(BamgVertex * & pva ,BamgVertex * & pvb ,AdjacentTriangle & tt1,Icoor2 & dets1, Icoor2 & detsa,Icoor2 & detsb, int & NbSwap) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/SwapForForcingEdge)*/ @@ -6002,5 +6002,5 @@ return ret; } - /*}}}1*/ + /*}}}*/ } Index: /issm/trunk-jpl/src/c/objects/Bamg/Metric.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/Metric.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/Metric.cpp (revision 12365) @@ -14,14 +14,13 @@ /*Constructor/Destructor*/ - /*FUNCTION Metric::Metric(){{{1*/ - /*FUNCTION Metric::Metric(double a){{{1*/ + /*FUNCTION Metric::Metric(double a){{{*/ Metric::Metric(double a): a11(1/(a*a)),a21(0),a22(1/(a*a)){ }/*}}}*/ - /*FUNCTION Metric::Metric(double a,double b,double c){{{1*/ + /*FUNCTION Metric::Metric(double a,double b,double c){{{*/ Metric::Metric(double a,double b,double c) :a11(a),a21(b),a22(c){ }/*}}}*/ - /*FUNCTION Metric::Metric(const double a[3],const Metric& m0, const Metric& m1,const Metric& m2 ){{{1*/ + /*FUNCTION Metric::Metric(const double a[3],const Metric& m0, const Metric& m1,const Metric& m2 ){{{*/ Metric::Metric(const double a[3],const Metric& m0, const Metric& m1,const Metric& m2 ){ /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/Metric)*/ @@ -43,6 +42,6 @@ *this = vab; } - /*}}}1*/ - /*FUNCTION Metric::Metric(double a,const Metric& ma, double b,const Metric& mb){{{1*/ + /*}}}*/ + /*FUNCTION Metric::Metric(double a,const Metric& ma, double b,const Metric& mb){{{*/ Metric::Metric(double a,const Metric& ma, double b,const Metric& mb) { /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/EigenMetric)*/ @@ -63,12 +62,12 @@ *this=vab; } - /*}}}1*/ + /*}}}*/ /*Methods*/ - /*FUNCTION Metric::det{{{1*/ + /*FUNCTION Metric::det{{{*/ double Metric::det() const { return a11*a22-a21*a21; } /*}}}*/ - /*FUNCTION Metric::Echo {{{1*/ + /*FUNCTION Metric::Echo {{{*/ void Metric::Echo(void){ @@ -79,5 +78,5 @@ } /*}}}*/ - /*FUNCTION Metric::IntersectWith{{{1*/ + /*FUNCTION Metric::IntersectWith{{{*/ int Metric::IntersectWith(const Metric& M2) { /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/IntersectWith)*/ @@ -131,6 +130,6 @@ return change; } - /*}}}1*/ - /*FUNCTION Metric::mul{{{1*/ + /*}}}*/ + /*FUNCTION Metric::mul{{{*/ R2 Metric::mul(const R2 x)const { return R2(a11*x.x+a21*x.y,a21*x.x+a22*x.y); @@ -138,5 +137,5 @@ /*Intermediary*/ - /*FUNCTION LengthInterpole{{{1*/ + /*FUNCTION LengthInterpole{{{*/ double LengthInterpole(const Metric& Ma,const Metric& Mb, R2 AB) { /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/LengthInterpole)*/ @@ -205,6 +204,6 @@ return l; } - /*}}}1*/ - /*FUNCTION SimultaneousMatrixReduction{{{1*/ + /*}}}*/ + /*FUNCTION SimultaneousMatrixReduction{{{*/ void SimultaneousMatrixReduction( Metric M1, Metric M2, D2xD2 &V) { /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/ReductionSimultanee)*/ @@ -308,6 +307,6 @@ } } - /*}}}1*/ - /*FUNCTION abscisseInterpole{{{1*/ + /*}}}*/ + /*FUNCTION abscisseInterpole{{{*/ double abscisseInterpole(const Metric& Ma,const Metric& Mb, R2 AB,double s,int optim) { /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/abscisseInterpole)*/ @@ -350,5 +349,5 @@ return r ; } - /*}}}1*/ + /*}}}*/ } Index: /issm/trunk-jpl/src/c/objects/Bamg/SetOfE4.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/SetOfE4.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/SetOfE4.cpp (revision 12365) @@ -5,5 +5,5 @@ /*Constructor*/ - /*FUNCTION SetOfEdges4::SetOfEdges4(long mmx,long nnx){{{1*/ + /*FUNCTION SetOfEdges4::SetOfEdges4(long mmx,long nnx){{{*/ SetOfEdges4::SetOfEdges4(long mmx,long nnx){ /*Original code from Frederic Hecht (BAMG v1.01, SetOfEdges4.cpp/SetOfEdges4)*/ @@ -23,8 +23,8 @@ while(i--) head[i]=-1; } - /*}}}1*/ + /*}}}*/ /*Methods*/ - /*FUNCTION SetOfEdges4::add{{{1*/ + /*FUNCTION SetOfEdges4::add{{{*/ long SetOfEdges4::add(long ii,long jj) { /*Original code from Frederic Hecht (BAMG v1.01, SetOfEdges4.cpp/add)*/ @@ -60,6 +60,6 @@ return NbOfEdges ++; } - /*}}}1*/ - /*FUNCTION SetOfEdges4::find {{{1*/ + /*}}}*/ + /*FUNCTION SetOfEdges4::find {{{*/ long SetOfEdges4::find(long ii,long jj) { /*Original code from Frederic Hecht (BAMG v1.01, SetOfEdges4.cpp/find)*/ @@ -87,34 +87,34 @@ return -1; } - /*}}}1*/ - /*FUNCTION SetOfEdges4::i{{{1*/ + /*}}}*/ + /*FUNCTION SetOfEdges4::i{{{*/ long SetOfEdges4::i(long k){ return Edges[k].i; } - /*}}}1*/ - /*FUNCTION SetOfEdges4::j{{{1*/ + /*}}}*/ + /*FUNCTION SetOfEdges4::j{{{*/ long SetOfEdges4::j(long k){ return Edges[k].j; } - /*}}}1*/ - /*FUNCTION SetOfEdges4::nb{{{1*/ + /*}}}*/ + /*FUNCTION SetOfEdges4::nb{{{*/ long SetOfEdges4::nb(){ return NbOfEdges; } - /*}}}1*/ - /*FUNCTION SetOfEdges4::newarete{{{1*/ + /*}}}*/ + /*FUNCTION SetOfEdges4::newarete{{{*/ long SetOfEdges4::newarete(long k){ return NbOfEdges == k+1; } - /*}}}1*/ - /*FUNCTION SetOfEdges4::SortAndAdd{{{1*/ + /*}}}*/ + /*FUNCTION SetOfEdges4::SortAndAdd{{{*/ long SetOfEdges4::SortAndAdd (long ii,long jj) { return ii <=jj ? add (ii,jj) : add (jj,ii) ; } - /*}}}1*/ - /*FUNCTION SetOfEdges4::SortAndFind{{{1*/ + /*}}}*/ + /*FUNCTION SetOfEdges4::SortAndFind{{{*/ long SetOfEdges4::SortAndFind (long ii,long jj) { return ii <=jj ? find (ii,jj) : find (jj,ii) ; } - /*}}}1*/ + /*}}}*/ } Index: /issm/trunk-jpl/src/c/objects/Bamg/SubDomain.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/SubDomain.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/SubDomain.cpp (revision 12365) @@ -12,5 +12,5 @@ /*Methods*/ - /*FUNCTION SubDomain::Set {{{1*/ + /*FUNCTION SubDomain::Set {{{*/ void SubDomain::Set(const Mesh & Th ,long i,Mesh & ThNew){ *this = Th.subdomains[i]; Index: /issm/trunk-jpl/src/c/objects/Bamg/Triangle.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/Triangle.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/Triangle.cpp (revision 12365) @@ -9,10 +9,10 @@ /*Constructors/Destructors*/ - /*FUNCTION Triangle(){{{1*/ + /*FUNCTION Triangle(){{{*/ Triangle::Triangle(void){ } /*}}}*/ - /*FUNCTION Triangle(Mesh *Th,long i,long j,long k) {{{1*/ + /*FUNCTION Triangle(Mesh *Th,long i,long j,long k) {{{*/ Triangle::Triangle(Mesh *Th,long i,long j,long k) { BamgVertex *v=Th->vertices; @@ -32,5 +32,5 @@ } /*}}}*/ - /*FUNCTION Triangle(BamgVertex *v0,BamgVertex *v1,BamgVertex *v2) {{{1*/ + /*FUNCTION Triangle(BamgVertex *v0,BamgVertex *v1,BamgVertex *v2) {{{*/ Triangle::Triangle(BamgVertex *v0,BamgVertex *v1,BamgVertex *v2){ vertices[0]=v0; @@ -47,9 +47,9 @@ /*Methods*/ - /*FUNCTION Triangle::Adj{{{1*/ + /*FUNCTION Triangle::Adj{{{*/ AdjacentTriangle Triangle::Adj(int i) const { return AdjacentTriangle(adj[i],AdjEdgeIndex[i]&3); };/*}}}*/ - /*FUNCTION Triangle::Anisotropy{{{1*/ + /*FUNCTION Triangle::Anisotropy{{{*/ double Triangle::Anisotropy() const{ @@ -80,5 +80,5 @@ return lmax/lmin; };/*}}}*/ - /*FUNCTION Triangle::Length{{{1*/ + /*FUNCTION Triangle::Length{{{*/ double Triangle::Length() const{ @@ -102,5 +102,5 @@ return l; };/*}}}*/ - /*FUNCTION Triangle::Echo {{{1*/ + /*FUNCTION Triangle::Echo {{{*/ void Triangle::Echo(void){ @@ -133,5 +133,5 @@ } /*}}}*/ - /*FUNCTION Triangle::FindBoundaryEdge{{{1*/ + /*FUNCTION Triangle::FindBoundaryEdge{{{*/ AdjacentTriangle Triangle::FindBoundaryEdge(int i) const{ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/FindBoundaryEdge)*/ @@ -179,23 +179,23 @@ return AdjacentTriangle(NULL,0); } - /*}}}1*/ - /*FUNCTION Triangle::GetAllflag{{{1*/ + /*}}}*/ + /*FUNCTION Triangle::GetAllflag{{{*/ int Triangle::GetAllflag(int a){ return AdjEdgeIndex[a] & 1020; }/*}}}*/ - /*FUNCTION Triangle::Hidden{{{1*/ + /*FUNCTION Triangle::Hidden{{{*/ int Triangle::Hidden(int a)const { return AdjEdgeIndex[a]&16; } /*}}}*/ - /*FUNCTION Triangle::Locked{{{1*/ + /*FUNCTION Triangle::Locked{{{*/ int Triangle::Locked(int a)const { return AdjEdgeIndex[a]&4; } /*}}}*/ - /*FUNCTION Triangle::NuEdgeTriangleAdj{{{1*/ + /*FUNCTION Triangle::NuEdgeTriangleAdj{{{*/ short Triangle::NuEdgeTriangleAdj(int i) const { /*Number of the adjacent edge in adj tria (make sure it is between 0 and 2*/ return AdjEdgeIndex[i&3]&3; }/*}}}*/ - /*FUNCTION Triangle::Optim{{{1*/ + /*FUNCTION Triangle::Optim{{{*/ long Triangle::Optim(short i,int koption) { /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Optim)*/ @@ -229,6 +229,6 @@ return NbSwap; } - /*}}}1*/ - /*FUNCTION Triangle::Quadrangle {{{1*/ + /*}}}*/ + /*FUNCTION Triangle::Quadrangle {{{*/ Triangle* Triangle::Quadrangle(BamgVertex * & v0,BamgVertex * & v1,BamgVertex * & v2,BamgVertex * & v3) const{ // return the other triangle of the quad if a quad or 0 if not a quat @@ -251,5 +251,5 @@ } /*}}}*/ - /*FUNCTION Triangle::QualityQuad {{{1*/ + /*FUNCTION Triangle::QualityQuad {{{*/ double Triangle::QualityQuad(int a,int option) const{ double q; @@ -274,5 +274,5 @@ } /*}}}*/ - /*FUNCTION Triangle::Renumbering(Triangle *tb,Triangle *te, long *renu){{{1*/ + /*FUNCTION Triangle::Renumbering(Triangle *tb,Triangle *te, long *renu){{{*/ void Triangle::Renumbering(Triangle *tb,Triangle *te, long *renu){ @@ -282,5 +282,5 @@ if (adj[2] >=tb && adj[2] =vb && vertices[0] =vb && vertices[2] t=this,vertices[0]->IndexInTriangle=0); @@ -363,5 +363,5 @@ if (vertices[2]) (vertices[2]->t=this,vertices[2]->IndexInTriangle=2); }/*}}}*/ - /*FUNCTION Triangle::SetUnMarkUnSwap{{{1*/ + /*FUNCTION Triangle::SetUnMarkUnSwap{{{*/ void Triangle::SetUnMarkUnSwap(int a){ register Triangle * t = adj[a]; @@ -369,5 +369,5 @@ AdjEdgeIndex[a] &=55 ; }/*}}}*/ - /*FUNCTION Triangle::swap{{{1*/ + /*FUNCTION Triangle::swap{{{*/ int Triangle::swap(short a,int koption){ /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/swap)*/ @@ -483,6 +483,6 @@ return OnSwap; } - /*}}}1*/ - /*FUNCTION Triangle::TriangleAdj{{{1*/ + /*}}}*/ + /*FUNCTION Triangle::TriangleAdj{{{*/ Triangle* Triangle::TriangleAdj(int i) const { return adj[i&3]; Index: /issm/trunk-jpl/src/c/objects/Bamg/VertexOnEdge.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/VertexOnEdge.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/VertexOnEdge.cpp (revision 12365) @@ -10,5 +10,5 @@ /*Methods*/ - /*FUNCTION VertexOnEdge::Set {{{1*/ + /*FUNCTION VertexOnEdge::Set {{{*/ void VertexOnEdge::Set(const Mesh & Th ,long i,Mesh & ThNew){ *this = Th.VertexOnBThEdge[i]; @@ -16,5 +16,5 @@ } /*}}}*/ - /*FUNCTION VertexOnEdge::SetOnBTh{{{1*/ + /*FUNCTION VertexOnEdge::SetOnBTh{{{*/ void VertexOnEdge::SetOnBTh(){ v->BackgroundEdgeHook=this; Index: /issm/trunk-jpl/src/c/objects/Bamg/VertexOnGeom.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/VertexOnGeom.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/VertexOnGeom.cpp (revision 12365) @@ -11,5 +11,5 @@ /*Constructors/Destructors*/ - /*FUNCTION VertexOnGeom::VertexOnGeom(){{{1*/ + /*FUNCTION VertexOnGeom::VertexOnGeom(){{{*/ VertexOnGeom::VertexOnGeom(){ meshvertex=NULL; @@ -18,5 +18,5 @@ } /*}}}*/ - /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomVertex &g){{{1*/ + /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomVertex &g){{{*/ VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomVertex &g){ meshvertex=&m; @@ -25,5 +25,5 @@ } /*}}}*/ - /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomEdge &g,double s){{{1*/ + /*FUNCTION VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomEdge &g,double s){{{*/ VertexOnGeom::VertexOnGeom(BamgVertex & m,GeomEdge &g,double s){ meshvertex=&m; @@ -34,5 +34,5 @@ /*Methods*/ - /*FUNCTION VertexOnGeom::Set {{{1*/ + /*FUNCTION VertexOnGeom::Set {{{*/ void VertexOnGeom::Set(const VertexOnGeom & rec,const Mesh & Th ,Mesh & ThNew){ *this = rec; @@ -46,20 +46,20 @@ } /*}}}*/ - /*FUNCTION VertexOnGeom::OnGeomVertex{{{1*/ + /*FUNCTION VertexOnGeom::OnGeomVertex{{{*/ int VertexOnGeom::OnGeomVertex()const{ return this? curvilincoord <0 :0; } /*}}}*/ - /*FUNCTION VertexOnGeom::OnGeomEdge{{{1*/ + /*FUNCTION VertexOnGeom::OnGeomEdge{{{*/ int VertexOnGeom::OnGeomEdge() const{ return this? curvilincoord >=0 :0; } /*}}}*/ - /*FUNCTION VertexOnGeom::IsRequiredVertex{{{1*/ + /*FUNCTION VertexOnGeom::IsRequiredVertex{{{*/ int VertexOnGeom::IsRequiredVertex() { return this? ((curvilincoord<0 ? (gv?gv->Required():0):0 )) : 0; } /*}}}*/ - /*FUNCTION VertexOnGeom::SetOn{{{1*/ + /*FUNCTION VertexOnGeom::SetOn{{{*/ void VertexOnGeom::SetOn(){ meshvertex->GeomEdgeHook=this; Index: /issm/trunk-jpl/src/c/objects/Bamg/VertexOnVertex.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Bamg/VertexOnVertex.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Bamg/VertexOnVertex.cpp (revision 12365) @@ -10,10 +10,10 @@ /*Constructors/Destructors*/ - /*FUNCTION VertexOnVertex::VertexOnVertex(){{{1*/ + /*FUNCTION VertexOnVertex::VertexOnVertex(){{{*/ VertexOnVertex::VertexOnVertex() { v=NULL; bv=NULL; };/*}}}*/ - /*FUNCTION VertexOnVertex::VertexOnVertex(BamgVertex * w,BamgVertex *bw){{{1*/ + /*FUNCTION VertexOnVertex::VertexOnVertex(BamgVertex * w,BamgVertex *bw){{{*/ VertexOnVertex::VertexOnVertex(BamgVertex * w,BamgVertex *bw) :v(w),bv(bw){ @@ -21,5 +21,5 @@ /*Methods*/ - /*FUNCTION VertexOnVertex::Set{{{1*/ + /*FUNCTION VertexOnVertex::Set{{{*/ void VertexOnVertex::Set(const Mesh &Th ,long i,Mesh &ThNew) { *this = Th.VertexOnBThVertex[i]; @@ -27,5 +27,5 @@ } /*}}}*/ - /*FUNCTION VertexOnVertex::SetOnBTh{{{1*/ + /*FUNCTION VertexOnVertex::SetOnBTh{{{*/ void VertexOnVertex::SetOnBTh(){ v->BackgroundVertexHook=bv;v->IndexInTriangle=IsVertexOnVertex; Index: /issm/trunk-jpl/src/c/objects/Constraints/Constraint.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/Constraint.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Constraints/Constraint.h (revision 12365) @@ -10,5 +10,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ class Nodes; #include "../Object.h" Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.cpp (revision 12365) @@ -18,10 +18,10 @@ /*SpcDynamic constructors and destructor*/ -/*FUNCTION SpcDynamic::SpcDynamic(){{{1*/ +/*FUNCTION SpcDynamic::SpcDynamic(){{{*/ SpcDynamic::SpcDynamic(){ return; } -/*}}}1*/ -/*FUNCTION SpcDynamic::SpcDynamic(int spc_sid,int spc_nodeid,...){{{1*/ +/*}}}*/ +/*FUNCTION SpcDynamic::SpcDynamic(int spc_sid,int spc_nodeid,...){{{*/ SpcDynamic::SpcDynamic(int spc_sid,int spc_nodeid, int spc_dof,int spc_analysis_type){ @@ -35,13 +35,13 @@ return; } -/*}}}1*/ -/*FUNCTION SpcDynamic::~SpcDynamic{{{1*/ +/*}}}*/ +/*FUNCTION SpcDynamic::~SpcDynamic{{{*/ SpcDynamic::~SpcDynamic(){ return; } -/*}}}1*/ +/*}}}*/ /*Object virtual functions definitions:*/ -/*FUNCTION SpcDynamic::Echo {{{1*/ +/*FUNCTION SpcDynamic::Echo {{{*/ void SpcDynamic::Echo(void){ @@ -55,6 +55,6 @@ return; } -/*}}}1*/ -/*FUNCTION SpcDynamic::DeepEcho {{{1*/ +/*}}}*/ +/*FUNCTION SpcDynamic::DeepEcho {{{*/ void SpcDynamic::DeepEcho(void){ @@ -62,15 +62,15 @@ return; } -/*}}}1*/ -/*FUNCTION SpcDynamic::Id {{{1*/ +/*}}}*/ +/*FUNCTION SpcDynamic::Id {{{*/ int SpcDynamic::Id(void){ return sid; } -/*}}}1*/ -/*FUNCTION SpcDynamic::MyRank {{{1*/ +/*}}}*/ +/*FUNCTION SpcDynamic::MyRank {{{*/ int SpcDynamic::MyRank(void){ extern int my_rank; return my_rank; } -/*}}}1*/ -/*FUNCTION SpcDynamic::ObjectEnum{{{1*/ +/*}}}*/ +/*FUNCTION SpcDynamic::ObjectEnum{{{*/ int SpcDynamic::ObjectEnum(void){ @@ -78,13 +78,13 @@ } -/*}}}1*/ -/*FUNCTION SpcDynamic::copy {{{1*/ +/*}}}*/ +/*FUNCTION SpcDynamic::copy {{{*/ Object* SpcDynamic::copy() { return new SpcDynamic(*this); } -/*}}}1*/ +/*}}}*/ /*Constraint virtual functions definitions: */ -/*FUNCTION SpcDynamic::InAnalysis{{{1*/ +/*FUNCTION SpcDynamic::InAnalysis{{{*/ bool SpcDynamic::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type) return true; @@ -92,5 +92,5 @@ } /*}}}*/ -/*FUNCTION SpcDynamic::ConstrainNode{{{1*/ +/*FUNCTION SpcDynamic::ConstrainNode{{{*/ void SpcDynamic::ConstrainNode(Nodes* nodes,Parameters* parameters){ @@ -110,16 +110,16 @@ /*SpcDynamic functions*/ -/*FUNCTION SpcDynamic::GetDof {{{1*/ +/*FUNCTION SpcDynamic::GetDof {{{*/ int SpcDynamic::GetDof(){ return dof; } -/*}}}1*/ -/*FUNCTION SpcDynamic::GetNodeId {{{1*/ +/*}}}*/ +/*FUNCTION SpcDynamic::GetNodeId {{{*/ int SpcDynamic::GetNodeId(){ return nodeid; } -/*}}}1*/ -/*FUNCTION SpcDynamic::GetValue {{{1*/ +/*}}}*/ +/*FUNCTION SpcDynamic::GetValue {{{*/ double SpcDynamic::GetValue(){ _assert_(this->isset); @@ -127,6 +127,6 @@ return value; } -/*}}}1*/ -/*FUNCTION SpcDynamic::SetDynamicConstraint {{{1*/ +/*}}}*/ +/*FUNCTION SpcDynamic::SetDynamicConstraint {{{*/ void SpcDynamic::SetDynamicConstraint(Nodes* nodes,double* yg_serial){ @@ -139,3 +139,3 @@ this->isset=true; } -/*}}}1*/ +/*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcDynamic.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Object.h" class DataSet; @@ -24,10 +24,10 @@ public: - /*SpcDynamic constructors, destructors:{{{1*/ + /*SpcDynamic constructors, destructors:{{{*/ SpcDynamic(); SpcDynamic(int sid,int nodeid, int dof,int analysis_type); ~SpcDynamic(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -37,9 +37,9 @@ Object* copy(); /*}}}*/ - /*Constraint virtual functions definitions: {{{1*/ + /*Constraint virtual functions definitions: {{{*/ void ConstrainNode(Nodes* nodes,Parameters* parameters); bool InAnalysis(int analysis_type); /*}}}*/ - /*SpcDynamic management:{{{1 */ + /*SpcDynamic management:{{{ */ int GetNodeId(); int GetDof(); Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.cpp (revision 12365) @@ -18,10 +18,10 @@ /*SpcStatic constructors and destructor*/ -/*FUNCTION SpcStatic::SpcStatic(){{{1*/ +/*FUNCTION SpcStatic::SpcStatic(){{{*/ SpcStatic::SpcStatic(){ return; } -/*}}}1*/ -/*FUNCTION SpcStatic::SpcStatic(int spc_sid,int spc_nodeid,...){{{1*/ +/*}}}*/ +/*FUNCTION SpcStatic::SpcStatic(int spc_sid,int spc_nodeid,...){{{*/ SpcStatic::SpcStatic(int spc_sid,int spc_nodeid, int spc_dof,double spc_value,int spc_analysis_type){ @@ -34,13 +34,13 @@ return; } -/*}}}1*/ -/*FUNCTION SpcStatic::~SpcStatic{{{1*/ +/*}}}*/ +/*FUNCTION SpcStatic::~SpcStatic{{{*/ SpcStatic::~SpcStatic(){ return; } -/*}}}1*/ +/*}}}*/ /*Object virtual functions definitions:*/ -/*FUNCTION SpcStatic::Echo {{{1*/ +/*FUNCTION SpcStatic::Echo {{{*/ void SpcStatic::Echo(void){ @@ -53,6 +53,6 @@ return; } -/*}}}1*/ -/*FUNCTION SpcStatic::DeepEcho {{{1*/ +/*}}}*/ +/*FUNCTION SpcStatic::DeepEcho {{{*/ void SpcStatic::DeepEcho(void){ @@ -65,15 +65,15 @@ return; } -/*}}}1*/ -/*FUNCTION SpcStatic::Id {{{1*/ +/*}}}*/ +/*FUNCTION SpcStatic::Id {{{*/ int SpcStatic::Id(void){ return sid; } -/*}}}1*/ -/*FUNCTION SpcStatic::MyRank {{{1*/ +/*}}}*/ +/*FUNCTION SpcStatic::MyRank {{{*/ int SpcStatic::MyRank(void){ extern int my_rank; return my_rank; } -/*}}}1*/ -/*FUNCTION SpcStatic::ObjectEnum{{{1*/ +/*}}}*/ +/*FUNCTION SpcStatic::ObjectEnum{{{*/ int SpcStatic::ObjectEnum(void){ @@ -81,13 +81,13 @@ } -/*}}}1*/ -/*FUNCTION SpcStatic::copy {{{1*/ +/*}}}*/ +/*FUNCTION SpcStatic::copy {{{*/ Object* SpcStatic::copy() { return new SpcStatic(*this); } -/*}}}1*/ +/*}}}*/ /*Constraint virtual functions definitions: */ -/*FUNCTION SpcStatic::InAnalysis{{{1*/ +/*FUNCTION SpcStatic::InAnalysis{{{*/ bool SpcStatic::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type) return true; @@ -95,5 +95,5 @@ } /*}}}*/ -/*FUNCTION SpcStatic::ConstrainNode{{{1*/ +/*FUNCTION SpcStatic::ConstrainNode{{{*/ void SpcStatic::ConstrainNode(Nodes* nodes,Parameters* parameters){ @@ -111,19 +111,19 @@ /*SpcStatic functions*/ -/*FUNCTION SpcStatic::GetDof {{{1*/ +/*FUNCTION SpcStatic::GetDof {{{*/ int SpcStatic::GetDof(){ return dof; } -/*}}}1*/ -/*FUNCTION SpcStatic::GetNodeId {{{1*/ +/*}}}*/ +/*FUNCTION SpcStatic::GetNodeId {{{*/ int SpcStatic::GetNodeId(){ return nodeid; } -/*}}}1*/ -/*FUNCTION SpcStatic::GetValue {{{1*/ +/*}}}*/ +/*FUNCTION SpcStatic::GetValue {{{*/ double SpcStatic::GetValue(){ _assert_(!isnan(value)); return value; } -/*}}}1*/ +/*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcStatic.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Object.h" class DataSet; @@ -23,10 +23,10 @@ public: - /*SpcStatic constructors, destructors:{{{1*/ + /*SpcStatic constructors, destructors:{{{*/ SpcStatic(); SpcStatic(int sid,int nodeid, int dof,double value,int analysis_type); ~SpcStatic(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -36,9 +36,9 @@ Object* copy(); /*}}}*/ - /*Constraint virtual functions definitions: {{{1*/ + /*Constraint virtual functions definitions: {{{*/ void ConstrainNode(Nodes* nodes,Parameters* parameters); bool InAnalysis(int analysis_type); /*}}}*/ - /*SpcStatic management:{{{1 */ + /*SpcStatic management:{{{ */ int GetNodeId(); int GetDof(); Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.cpp (revision 12365) @@ -18,5 +18,5 @@ /*SpcTransient constructors and destructor*/ -/*FUNCTION SpcTransient::SpcTransient(){{{1*/ +/*FUNCTION SpcTransient::SpcTransient(){{{*/ SpcTransient::SpcTransient(){ sid=-1; @@ -29,6 +29,6 @@ return; } -/*}}}1*/ -/*FUNCTION SpcTransient::SpcTransient(int spc_sid,int spc_nodeid,...){{{1*/ +/*}}}*/ +/*FUNCTION SpcTransient::SpcTransient(int spc_sid,int spc_nodeid,...){{{*/ SpcTransient::SpcTransient(int spc_sid,int spc_nodeid, int spc_dof,int spc_nsteps, double* spc_times, double* spc_values,int spc_analysis_type){ @@ -46,6 +46,6 @@ return; } -/*}}}1*/ -/*FUNCTION SpcTransient::~SpcTransient{{{1*/ +/*}}}*/ +/*FUNCTION SpcTransient::~SpcTransient{{{*/ SpcTransient::~SpcTransient(){ xfree((void**)×); @@ -53,8 +53,8 @@ return; } -/*}}}1*/ +/*}}}*/ /*Object virtual functions definitions:*/ -/*FUNCTION SpcTransient::Echo {{{1*/ +/*FUNCTION SpcTransient::Echo {{{*/ void SpcTransient::Echo(void){ @@ -72,20 +72,20 @@ return; } -/*}}}1*/ -/*FUNCTION SpcTransient::DeepEcho {{{1*/ +/*}}}*/ +/*FUNCTION SpcTransient::DeepEcho {{{*/ void SpcTransient::DeepEcho(void){ this->Echo(); } -/*}}}1*/ -/*FUNCTION SpcTransient::Id {{{1*/ +/*}}}*/ +/*FUNCTION SpcTransient::Id {{{*/ int SpcTransient::Id(void){ return sid; } -/*}}}1*/ -/*FUNCTION SpcTransient::MyRank {{{1*/ +/*}}}*/ +/*FUNCTION SpcTransient::MyRank {{{*/ int SpcTransient::MyRank(void){ extern int my_rank; return my_rank; } -/*}}}1*/ -/*FUNCTION SpcTransient::ObjectEnum{{{1*/ +/*}}}*/ +/*FUNCTION SpcTransient::ObjectEnum{{{*/ int SpcTransient::ObjectEnum(void){ @@ -93,13 +93,13 @@ } -/*}}}1*/ -/*FUNCTION SpcTransient::copy {{{1*/ +/*}}}*/ +/*FUNCTION SpcTransient::copy {{{*/ Object* SpcTransient::copy() { return new SpcTransient(sid,nodeid,dof,nsteps,times,values,analysis_type); } -/*}}}1*/ +/*}}}*/ /*Constraint virtual functions definitions:*/ -/*FUNCTION SpcTransient::InAnalysis{{{1*/ +/*FUNCTION SpcTransient::InAnalysis{{{*/ bool SpcTransient::InAnalysis(int in_analysis_type){ @@ -108,5 +108,5 @@ } /*}}}*/ -/*FUNCTION SpcTransient::ConstrainNode{{{1*/ +/*FUNCTION SpcTransient::ConstrainNode{{{*/ void SpcTransient::ConstrainNode(Nodes* nodes,Parameters* parameters){ @@ -158,19 +158,19 @@ /*SpcTransient functions*/ -/*FUNCTION SpcTransient::GetDof {{{1*/ +/*FUNCTION SpcTransient::GetDof {{{*/ int SpcTransient::GetDof(){ return dof; } -/*}}}1*/ -/*FUNCTION SpcTransient::GetNodeId {{{1*/ +/*}}}*/ +/*FUNCTION SpcTransient::GetNodeId {{{*/ int SpcTransient::GetNodeId(){ return nodeid; } -/*}}}1*/ -/*FUNCTION SpcTransient::GetValue {{{1*/ +/*}}}*/ +/*FUNCTION SpcTransient::GetValue {{{*/ double SpcTransient::GetValue(){ return values[0]; } -/*}}}1*/ +/*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Constraints/SpcTransient.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Object.h" class DataSet; @@ -25,10 +25,10 @@ public: - /*SpcTransient constructors, destructors:{{{1*/ + /*SpcTransient constructors, destructors:{{{*/ SpcTransient(); SpcTransient(int sid,int nodeid, int dof,int nsteps, double* times, double* values,int analysis_type); ~SpcTransient(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -38,9 +38,9 @@ Object* copy(); /*}}}*/ - /*Constraint virtual functions definitions: {{{1*/ + /*Constraint virtual functions definitions: {{{*/ void ConstrainNode(Nodes* nodes,Parameters* parameters); bool InAnalysis(int analysis_type); /*}}}*/ - /*SpcTransient management:{{{1 */ + /*SpcTransient management:{{{ */ int GetNodeId(); int GetDof(); Index: /issm/trunk-jpl/src/c/objects/Contour.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Contour.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Contour.cpp (revision 12365) @@ -15,5 +15,5 @@ /*Contour constructors and destructors:*/ -/*FUNCTION Contour::Contour() default constructor {{{1*/ +/*FUNCTION Contour::Contour() default constructor {{{*/ Contour::Contour(){ this->id=0; @@ -24,5 +24,5 @@ } /*}}}*/ -/*FUNCTION Contour::Contour(int pid, int nods, IssmDouble* x, IssmDouble* y,bool closed) {{{1*/ +/*FUNCTION Contour::Contour(int pid, int nods, IssmDouble* x, IssmDouble* y,bool closed) {{{*/ Contour::Contour(int pid,int pnods, IssmDouble* px, IssmDouble* py,bool pclosed){ @@ -38,5 +38,5 @@ } /*}}}*/ -/*FUNCTION Contour::Contour() default constructor {{{1*/ +/*FUNCTION Contour::Contour() default constructor {{{*/ Contour::~Contour(){ xDelete(this->x); @@ -47,5 +47,5 @@ /*Object virtual function resolutoin: */ -/*FUNCTION Contour::Echo(){{{1*/ +/*FUNCTION Contour::Echo(){{{*/ void Contour::Echo(void){ @@ -63,15 +63,15 @@ } /*}}}*/ -/*FUNCTION Contour::DeepEcho(){{{1*/ +/*FUNCTION Contour::DeepEcho(){{{*/ void Contour::DeepEcho(void){ this->Echo(); } /*}}}*/ -/*FUNCTION Contour::Id(){{{1*/ +/*FUNCTION Contour::Id(){{{*/ int Contour::Id(void){ return id; } /*}}}*/ -/*FUNCTION Contour::MyRank{{{1*/ +/*FUNCTION Contour::MyRank{{{*/ int Contour::MyRank(void){ extern int my_rank; @@ -80,5 +80,5 @@ } /*}}}*/ -/*FUNCTION Contour::ObjectEnum{{{1*/ +/*FUNCTION Contour::ObjectEnum{{{*/ int Contour::ObjectEnum(void){ @@ -87,5 +87,5 @@ } /*}}}*/ -/*FUNCTION Contour::copy {{{1*/ +/*FUNCTION Contour::copy {{{*/ Object* Contour::copy() { Index: /issm/trunk-jpl/src/c/objects/Contour.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Contour.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Contour.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Object.h" #include "../shared/Exceptions/exceptions.h" @@ -24,10 +24,10 @@ bool closed; //is this contour closed? - /*Contour constructors, destructors {{{1*/ + /*Contour constructors, destructors {{{*/ Contour(); Contour(int id, int nods, IssmDouble* x, IssmDouble* y,bool closed); ~Contour(); /*}}}*/ - /*Object virtual functions{{{1*/ + /*Object virtual functions{{{*/ void Echo(void); void DeepEcho(void); Index: /issm/trunk-jpl/src/c/objects/DakotaPlugin.h =================================================================== --- /issm/trunk-jpl/src/c/objects/DakotaPlugin.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/DakotaPlugin.h (revision 12365) @@ -9,5 +9,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ Index: /issm/trunk-jpl/src/c/objects/DofIndexing.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/DofIndexing.cpp (revision 12365) @@ -18,5 +18,5 @@ /*DofIndexing constructors and destructor*/ -/*FUNCTION DofIndexing::DofIndexing(){{{1*/ +/*FUNCTION DofIndexing::DofIndexing(){{{*/ DofIndexing::DofIndexing(){ @@ -35,10 +35,10 @@ } /*}}}*/ -/*FUNCTION DofIndexing::DofIndexing(int gsize){{{1*/ +/*FUNCTION DofIndexing::DofIndexing(int gsize){{{*/ DofIndexing::DofIndexing(int in_gsize){ this->Init(in_gsize,NULL); } /*}}}*/ -/*FUNCTION DofIndexing::DofIndexing(DofIndexing* in) -> copy{{{1*/ +/*FUNCTION DofIndexing::DofIndexing(DofIndexing* in) -> copy{{{*/ DofIndexing::DofIndexing(DofIndexing* in){ //copy constructor @@ -79,5 +79,5 @@ } /*}}}*/ -/*FUNCTION DofIndexing::~DofIndexing() {{{1*/ +/*FUNCTION DofIndexing::~DofIndexing() {{{*/ DofIndexing::~DofIndexing(){ //destructor @@ -92,5 +92,5 @@ } /*}}}*/ -/*FUNCTION DofIndexing::Init{{{1*/ +/*FUNCTION DofIndexing::Init{{{*/ void DofIndexing::Init(int in_gsize,int* in_doftype){ @@ -119,5 +119,5 @@ } /*}}}*/ -/*FUNCTION DofIndexing::InitSet{{{1*/ +/*FUNCTION DofIndexing::InitSet{{{*/ void DofIndexing::InitSet(int setenum){ @@ -148,5 +148,5 @@ /*Some of the Object functionality: */ -/*FUNCTION DofIndexing::Echo{{{1*/ +/*FUNCTION DofIndexing::Echo{{{*/ void DofIndexing::Echo(void){ @@ -158,5 +158,5 @@ } /*}}}*/ -/*FUNCTION DofIndexing::DeepEcho{{{1*/ +/*FUNCTION DofIndexing::DeepEcho{{{*/ void DofIndexing::DeepEcho(void){ Index: /issm/trunk-jpl/src/c/objects/DofIndexing.h =================================================================== --- /issm/trunk-jpl/src/c/objects/DofIndexing.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/DofIndexing.h (revision 12365) @@ -34,5 +34,5 @@ - /*DofIndexing constructors, destructors {{{1*/ + /*DofIndexing constructors, destructors {{{*/ DofIndexing(); DofIndexing(int g_size); @@ -42,10 +42,10 @@ ~DofIndexing(); /*}}}*/ - /*Object like functionality: {{{1*/ + /*Object like functionality: {{{*/ void Echo(void); void DeepEcho(void); void copy(DofIndexing* properties); /*}}}*/ - /*DofIndexing management: {{{1*/ + /*DofIndexing management: {{{*/ DofIndexing* Spawn(int* indices, int numindices); /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.cpp (revision 12365) @@ -19,10 +19,10 @@ /*BoolElementResult constructors and destructor*/ -/*FUNCTION BoolElementResult::BoolElementResult(){{{1*/ +/*FUNCTION BoolElementResult::BoolElementResult(){{{*/ BoolElementResult::BoolElementResult(){ return; } /*}}}*/ -/*FUNCTION BoolElementResult::BoolElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){{{1*/ +/*FUNCTION BoolElementResult::BoolElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){{{*/ BoolElementResult::BoolElementResult(int in_enum_type,bool in_value,int in_step, double in_time){ @@ -33,5 +33,5 @@ } /*}}}*/ -/*FUNCTION BoolElementResult::~BoolElementResult(){{{1*/ +/*FUNCTION BoolElementResult::~BoolElementResult(){{{*/ BoolElementResult::~BoolElementResult(){ return; @@ -40,10 +40,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION BoolElementResult::Echo {{{1*/ +/*FUNCTION BoolElementResult::Echo {{{*/ void BoolElementResult::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION BoolElementResult::DeepEcho{{{1*/ +/*FUNCTION BoolElementResult::DeepEcho{{{*/ void BoolElementResult::DeepEcho(void){ @@ -55,8 +55,8 @@ } /*}}}*/ -/*FUNCTION BoolElementResult::Id{{{1*/ +/*FUNCTION BoolElementResult::Id{{{*/ int BoolElementResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION BoolElementResult::MyRank{{{1*/ +/*FUNCTION BoolElementResult::MyRank{{{*/ int BoolElementResult::MyRank(void){ extern int my_rank; @@ -64,5 +64,5 @@ } /*}}}*/ -/*FUNCTION BoolElementResult::ObjectEnum{{{1*/ +/*FUNCTION BoolElementResult::ObjectEnum{{{*/ int BoolElementResult::ObjectEnum(void){ @@ -71,5 +71,5 @@ } /*}}}*/ -/*FUNCTION BoolElementResult::copy{{{1*/ +/*FUNCTION BoolElementResult::copy{{{*/ Object* BoolElementResult::copy() { @@ -80,5 +80,5 @@ /*ElementResult management*/ -/*FUNCTION BoolElementResult::InstanceEnum{{{1*/ +/*FUNCTION BoolElementResult::InstanceEnum{{{*/ int BoolElementResult::InstanceEnum(void){ @@ -87,5 +87,5 @@ } /*}}}*/ -/*FUNCTION BoolElementResult::SpawnTriaElementResult{{{1*/ +/*FUNCTION BoolElementResult::SpawnTriaElementResult{{{*/ ElementResult* BoolElementResult::SpawnTriaElementResult(int* indices){ @@ -104,5 +104,5 @@ } /*}}}*/ -/*FUNCTION BoolElementResult::ProcessUnits{{{1*/ +/*FUNCTION BoolElementResult::ProcessUnits{{{*/ void BoolElementResult::ProcessUnits(Parameters* parameters){ @@ -111,10 +111,10 @@ } /*}}}*/ -/*FUNCTION BoolElementResult::NumberOfNodalValues{{{1*/ +/*FUNCTION BoolElementResult::NumberOfNodalValues{{{*/ int BoolElementResult::NumberOfNodalValues(void){ return 1; } /*}}}*/ -/*FUNCTION BoolElementResult::PatchFill{{{1*/ +/*FUNCTION BoolElementResult::PatchFill{{{*/ void BoolElementResult::PatchFill(int row, Patch* patch){ @@ -127,10 +127,10 @@ } /*}}}*/ -/*FUNCTION BoolElementResult::GetVectorFromResults{{{1*/ +/*FUNCTION BoolElementResult::GetVectorFromResults{{{*/ void BoolElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){ _error_("cannot return vector on vertices"); } /*}}}*/ -/*FUNCTION BoolElementResult::GetElementVectorFromResults{{{1*/ +/*FUNCTION BoolElementResult::GetElementVectorFromResults{{{*/ void BoolElementResult::GetElementVectorFromResults(Vector* vector,int dof){ Index: /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ElementResults/BoolElementResult.h (revision 12365) @@ -9,5 +9,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Inputs/Input.h" #include "../../include/include.h" @@ -25,10 +25,10 @@ public: - /*BoolElementResult constructors, destructors: {{{1*/ + /*BoolElementResult constructors, destructors: {{{*/ BoolElementResult(); BoolElementResult(int enum_type,bool value,int step,double time); ~BoolElementResult(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -38,5 +38,5 @@ Object* copy(); /*}}}*/ - /*ElementResult virtual functions definitions: {{{1*/ + /*ElementResult virtual functions definitions: {{{*/ ElementResult* SpawnTriaElementResult(int* indices); double GetTime(void){return time;}; @@ -46,5 +46,5 @@ void PatchFill(int row, Patch* patch); /*}}}*/ - /*BoolElementResult management: {{{1*/ + /*BoolElementResult management: {{{*/ int InstanceEnum(); void GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs); Index: /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.cpp (revision 12365) @@ -19,10 +19,10 @@ /*DoubleElementResult constructors and destructor*/ -/*FUNCTION DoubleElementResult::DoubleElementResult(){{{1*/ +/*FUNCTION DoubleElementResult::DoubleElementResult(){{{*/ DoubleElementResult::DoubleElementResult(){ return; } /*}}}*/ -/*FUNCTION DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){{{1*/ +/*FUNCTION DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){{{*/ DoubleElementResult::DoubleElementResult(int in_enum_type,IssmDouble in_value,int in_step, double in_time){ @@ -33,5 +33,5 @@ } /*}}}*/ -/*FUNCTION DoubleElementResult::~DoubleElementResult(){{{1*/ +/*FUNCTION DoubleElementResult::~DoubleElementResult(){{{*/ DoubleElementResult::~DoubleElementResult(){ return; @@ -40,10 +40,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION DoubleElementResult::Echo {{{1*/ +/*FUNCTION DoubleElementResult::Echo {{{*/ void DoubleElementResult::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION DoubleElementResult::DeepEcho{{{1*/ +/*FUNCTION DoubleElementResult::DeepEcho{{{*/ void DoubleElementResult::DeepEcho(void){ @@ -55,8 +55,8 @@ } /*}}}*/ -/*FUNCTION DoubleElementResult::Id{{{1*/ +/*FUNCTION DoubleElementResult::Id{{{*/ int DoubleElementResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleElementResult::MyRank{{{1*/ +/*FUNCTION DoubleElementResult::MyRank{{{*/ int DoubleElementResult::MyRank(void){ extern int my_rank; @@ -64,5 +64,5 @@ } /*}}}*/ -/*FUNCTION DoubleElementResult::ObjectEnum{{{1*/ +/*FUNCTION DoubleElementResult::ObjectEnum{{{*/ int DoubleElementResult::ObjectEnum(void){ @@ -71,5 +71,5 @@ } /*}}}*/ -/*FUNCTION DoubleElementResult::copy{{{1*/ +/*FUNCTION DoubleElementResult::copy{{{*/ Object* DoubleElementResult::copy() { @@ -80,5 +80,5 @@ /*ElementResult management*/ -/*FUNCTION DoubleElementResult::InstanceEnum{{{1*/ +/*FUNCTION DoubleElementResult::InstanceEnum{{{*/ int DoubleElementResult::InstanceEnum(void){ @@ -87,5 +87,5 @@ } /*}}}*/ -/*FUNCTION DoubleElementResult::SpawnTriaElementResult{{{1*/ +/*FUNCTION DoubleElementResult::SpawnTriaElementResult{{{*/ ElementResult* DoubleElementResult::SpawnTriaElementResult(int* indices){ @@ -104,5 +104,5 @@ } /*}}}*/ -/*FUNCTION DoubleElementResult::ProcessUnits{{{1*/ +/*FUNCTION DoubleElementResult::ProcessUnits{{{*/ void DoubleElementResult::ProcessUnits(Parameters* parameters){ @@ -111,10 +111,10 @@ } /*}}}*/ -/*FUNCTION DoubleElementResult::NumberOfNodalValues{{{1*/ +/*FUNCTION DoubleElementResult::NumberOfNodalValues{{{*/ int DoubleElementResult::NumberOfNodalValues(void){ return 1; } /*}}}*/ -/*FUNCTION DoubleElementResult::PatchFill{{{1*/ +/*FUNCTION DoubleElementResult::PatchFill{{{*/ void DoubleElementResult::PatchFill(int row, Patch* patch){ Index: /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ElementResults/DoubleElementResult.h (revision 12365) @@ -9,5 +9,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Inputs/Input.h" #include "../../include/include.h" @@ -25,10 +25,10 @@ public: - /*DoubleElementResult constructors, destructors: {{{1*/ + /*DoubleElementResult constructors, destructors: {{{*/ DoubleElementResult(); DoubleElementResult(int enum_type,double value,int step,double time); ~DoubleElementResult(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -38,5 +38,5 @@ Object* copy(); /*}}}*/ - /*ElementResult virtual functions definitions: {{{1*/ + /*ElementResult virtual functions definitions: {{{*/ ElementResult* SpawnTriaElementResult(int* indices); double GetTime(void){return time;}; @@ -46,5 +46,5 @@ void PatchFill(int row, Patch* patch); /*}}}*/ - /*DoubleElementResult management: {{{1*/ + /*DoubleElementResult management: {{{*/ int InstanceEnum(); void GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){_error_("not implemented");}; Index: /issm/trunk-jpl/src/c/objects/ElementResults/ElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/ElementResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ElementResults/ElementResult.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Object.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.cpp (revision 12365) @@ -19,10 +19,10 @@ /*PentaP1ElementResult constructors and destructor*/ -/*FUNCTION PentaP1ElementResult::PentaP1ElementResult(){{{1*/ +/*FUNCTION PentaP1ElementResult::PentaP1ElementResult(){{{*/ PentaP1ElementResult::PentaP1ElementResult(){ return; } /*}}}*/ -/*FUNCTION PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ +/*FUNCTION PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{*/ PentaP1ElementResult::PentaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){ @@ -35,5 +35,5 @@ } /*}}}*/ -/*FUNCTION PentaP1ElementResult::~PentaP1ElementResult(){{{1*/ +/*FUNCTION PentaP1ElementResult::~PentaP1ElementResult(){{{*/ PentaP1ElementResult::~PentaP1ElementResult(){ return; @@ -42,10 +42,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION PentaP1ElementResult::Echo {{{1*/ +/*FUNCTION PentaP1ElementResult::Echo {{{*/ void PentaP1ElementResult::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION PentaP1ElementResult::DeepEcho{{{1*/ +/*FUNCTION PentaP1ElementResult::DeepEcho{{{*/ void PentaP1ElementResult::DeepEcho(void){ @@ -58,8 +58,8 @@ } /*}}}*/ -/*FUNCTION PentaP1ElementResult::Id{{{1*/ +/*FUNCTION PentaP1ElementResult::Id{{{*/ int PentaP1ElementResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION PentaP1ElementResult::MyRank{{{1*/ +/*FUNCTION PentaP1ElementResult::MyRank{{{*/ int PentaP1ElementResult::MyRank(void){ extern int my_rank; @@ -67,5 +67,5 @@ } /*}}}*/ -/*FUNCTION PentaP1ElementResult::ObjectEnum{{{1*/ +/*FUNCTION PentaP1ElementResult::ObjectEnum{{{*/ int PentaP1ElementResult::ObjectEnum(void){ @@ -74,5 +74,5 @@ } /*}}}*/ -/*FUNCTION PentaP1ElementResult::copy{{{1*/ +/*FUNCTION PentaP1ElementResult::copy{{{*/ Object* PentaP1ElementResult::copy() { @@ -83,5 +83,5 @@ /*ElementResult management*/ -/*FUNCTION PentaP1ElementResult::InstanceEnum{{{1*/ +/*FUNCTION PentaP1ElementResult::InstanceEnum{{{*/ int PentaP1ElementResult::InstanceEnum(void){ @@ -90,5 +90,5 @@ } /*}}}*/ -/*FUNCTION PentaP1ElementResult::SpawnTriaElementResult{{{1*/ +/*FUNCTION PentaP1ElementResult::SpawnTriaElementResult{{{*/ ElementResult* PentaP1ElementResult::SpawnTriaElementResult(int* indices){ @@ -115,5 +115,5 @@ } /*}}}*/ -/*FUNCTION PentaP1ElementResult::ProcessUnits{{{1*/ +/*FUNCTION PentaP1ElementResult::ProcessUnits{{{*/ void PentaP1ElementResult::ProcessUnits(Parameters* parameters){ @@ -122,10 +122,10 @@ } /*}}}*/ -/*FUNCTION PentaP1ElementResult::NumberOfNodalValues{{{1*/ +/*FUNCTION PentaP1ElementResult::NumberOfNodalValues{{{*/ int PentaP1ElementResult::NumberOfNodalValues(void){ return 6; } /*}}}*/ -/*FUNCTION PentaP1ElementResult::PatchFill{{{1*/ +/*FUNCTION PentaP1ElementResult::PatchFill{{{*/ void PentaP1ElementResult::PatchFill(int row, Patch* patch){ @@ -137,5 +137,5 @@ } /*}}}*/ -/*FUNCTION PentaP1ElementResult::GetVectorFromResults{{{1*/ +/*FUNCTION PentaP1ElementResult::GetVectorFromResults{{{*/ void PentaP1ElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){ @@ -147,5 +147,5 @@ } /*}}}*/ -/*FUNCTION PentaP1ElementResult::GetElementVectorFromResults{{{1*/ +/*FUNCTION PentaP1ElementResult::GetElementVectorFromResults{{{*/ void PentaP1ElementResult::GetElementVectorFromResults(Vector* vector,int dof){ Index: /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ElementResults/PentaP1ElementResult.h (revision 12365) @@ -9,5 +9,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Inputs/Input.h" #include "../../include/include.h" @@ -24,10 +24,10 @@ public: - /*PentaP1ElementResult constructors, destructors: {{{1*/ + /*PentaP1ElementResult constructors, destructors: {{{*/ PentaP1ElementResult(); PentaP1ElementResult(int enum_type,double* values,int step, double time); ~PentaP1ElementResult(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -37,5 +37,5 @@ Object* copy(); /*}}}*/ - /*ElementResult virtual functions definitions: {{{1*/ + /*ElementResult virtual functions definitions: {{{*/ ElementResult* SpawnTriaElementResult(int* indices); double GetTime(void){return time;}; @@ -45,5 +45,5 @@ void PatchFill(int row, Patch* patch); /*}}}*/ - /*PentaP1ElementResult management: {{{1*/ + /*PentaP1ElementResult management: {{{*/ int InstanceEnum(); void GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs); Index: /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.cpp (revision 12365) @@ -19,10 +19,10 @@ /*TriaP1ElementResult constructors and destructor*/ -/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(){{{1*/ +/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(){{{*/ TriaP1ElementResult::TriaP1ElementResult(){ return; } /*}}}*/ -/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{1*/ +/*FUNCTION TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){{{*/ TriaP1ElementResult::TriaP1ElementResult(int in_enum_type,double* in_values,int in_step, double in_time){ @@ -35,5 +35,5 @@ } /*}}}*/ -/*FUNCTION TriaP1ElementResult::~TriaP1ElementResult(){{{1*/ +/*FUNCTION TriaP1ElementResult::~TriaP1ElementResult(){{{*/ TriaP1ElementResult::~TriaP1ElementResult(){ return; @@ -42,10 +42,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION TriaP1ElementResult::Echo {{{1*/ +/*FUNCTION TriaP1ElementResult::Echo {{{*/ void TriaP1ElementResult::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION TriaP1ElementResult::DeepEcho{{{1*/ +/*FUNCTION TriaP1ElementResult::DeepEcho{{{*/ void TriaP1ElementResult::DeepEcho(void){ @@ -57,8 +57,8 @@ } /*}}}*/ -/*FUNCTION TriaP1ElementResult::Id{{{1*/ +/*FUNCTION TriaP1ElementResult::Id{{{*/ int TriaP1ElementResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION TriaP1ElementResult::MyRank{{{1*/ +/*FUNCTION TriaP1ElementResult::MyRank{{{*/ int TriaP1ElementResult::MyRank(void){ extern int my_rank; @@ -66,5 +66,5 @@ } /*}}}*/ -/*FUNCTION TriaP1ElementResult::ObjectEnum{{{1*/ +/*FUNCTION TriaP1ElementResult::ObjectEnum{{{*/ int TriaP1ElementResult::ObjectEnum(void){ @@ -73,5 +73,5 @@ } /*}}}*/ -/*FUNCTION TriaP1ElementResult::copy{{{1*/ +/*FUNCTION TriaP1ElementResult::copy{{{*/ Object* TriaP1ElementResult::copy() { @@ -82,5 +82,5 @@ /*ElementResult management*/ -/*FUNCTION TriaP1ElementResult::InstanceEnum{{{1*/ +/*FUNCTION TriaP1ElementResult::InstanceEnum{{{*/ int TriaP1ElementResult::InstanceEnum(void){ @@ -89,5 +89,5 @@ } /*}}}*/ -/*FUNCTION TriaP1ElementResult::SpawnTriaElementResult{{{1*/ +/*FUNCTION TriaP1ElementResult::SpawnTriaElementResult{{{*/ ElementResult* TriaP1ElementResult::SpawnTriaElementResult(int* indices){ @@ -103,5 +103,5 @@ } /*}}}*/ -/*FUNCTION TriaP1ElementResult::ProcessUnits{{{1*/ +/*FUNCTION TriaP1ElementResult::ProcessUnits{{{*/ void TriaP1ElementResult::ProcessUnits(Parameters* parameters){ @@ -110,10 +110,10 @@ } /*}}}*/ -/*FUNCTION TriaP1ElementResult::NumberOfNodalValues{{{1*/ +/*FUNCTION TriaP1ElementResult::NumberOfNodalValues{{{*/ int TriaP1ElementResult::NumberOfNodalValues(void){ return 3; } /*}}}*/ -/*FUNCTION TriaP1ElementResult::PatchFill{{{1*/ +/*FUNCTION TriaP1ElementResult::PatchFill{{{*/ void TriaP1ElementResult::PatchFill(int row, Patch* patch){ @@ -125,5 +125,5 @@ } /*}}}*/ -/*FUNCTION TriaP1ElementResult::GetVectorFromResults{{{1*/ +/*FUNCTION TriaP1ElementResult::GetVectorFromResults{{{*/ void TriaP1ElementResult::GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs){ @@ -135,5 +135,5 @@ } /*}}}*/ -/*FUNCTION TriaP1ElementResult::GetElementVectorFromResults{{{1*/ +/*FUNCTION TriaP1ElementResult::GetElementVectorFromResults{{{*/ void TriaP1ElementResult::GetElementVectorFromResults(Vector* vector,int dof){ _error_("Result %s is a TriaP1ElementResult and should not write vector of size numberofelemenrs",EnumToStringx(enum_type)); Index: /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ElementResults/TriaP1ElementResult.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Inputs/Input.h" #include "../../include/include.h" @@ -23,10 +23,10 @@ public: - /*TriaP1ElementResult constructors, destructors: {{{1*/ + /*TriaP1ElementResult constructors, destructors: {{{*/ TriaP1ElementResult(); TriaP1ElementResult(int enum_type,double* values,int step,double time); ~TriaP1ElementResult(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -36,5 +36,5 @@ Object* copy(); /*}}}*/ - /*ElementResult virtual functions definitions: {{{1*/ + /*ElementResult virtual functions definitions: {{{*/ ElementResult* SpawnTriaElementResult(int* indices); double GetTime(void){return time;}; @@ -44,5 +44,5 @@ void PatchFill(int row, Patch* patch); /*}}}*/ - /*TriaP1ElementResult management: {{{1*/ + /*TriaP1ElementResult management: {{{*/ int InstanceEnum(); void GetVectorFromResults(Vector* vector,int* doflist,int* connectivitylist,int numdofs); Index: /issm/trunk-jpl/src/c/objects/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Element.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Elements/Element.h (revision 12365) @@ -10,5 +10,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Object.h" Index: /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -24,5 +24,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION Penta::Penta(){{{1*/ +/*FUNCTION Penta::Penta(){{{*/ Penta::Penta(){ @@ -39,5 +39,5 @@ } /*}}}*/ -/*FUNCTION Penta::~Penta(){{{1*/ +/*FUNCTION Penta::~Penta(){{{*/ Penta::~Penta(){ delete inputs; @@ -46,5 +46,5 @@ } /*}}}*/ -/*FUNCTION Penta::Penta(int id, int index, IoModel* iomodel,int nummodels) {{{1*/ +/*FUNCTION Penta::Penta(int id, int index, IoModel* iomodel,int nummodels) {{{*/ Penta::Penta(int penta_id, int penta_sid, int index, IoModel* iomodel,int nummodels) :PentaRef(nummodels) @@ -56,5 +56,5 @@ /*Checks in debugging mode*/ - /*{{{2*/ + /*{{{*/ _assert_(iomodel->Data(MeshUpperelementsEnum)); _assert_(iomodel->Data(MeshLowerelementsEnum)); @@ -90,5 +90,5 @@ } /*}}}*/ -/*FUNCTION Penta::copy {{{1*/ +/*FUNCTION Penta::copy {{{*/ Object* Penta::copy() { @@ -144,10 +144,10 @@ /*Other*/ -/*FUNCTION Penta::AverageOntoPartition {{{1*/ +/*FUNCTION Penta::AverageOntoPartition {{{*/ void Penta::AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,double* vertex_response,double* qmu_part){ _error_("Not supported yet!"); } /*}}}*/ -/*FUNCTION Penta::BedNormal {{{1*/ +/*FUNCTION Penta::BedNormal {{{*/ void Penta::BedNormal(double* bed_normal, double xyz_list[3][3]){ @@ -173,5 +173,5 @@ } /*}}}*/ -/*FUNCTION Penta::BasalFrictionCreateInput {{{1*/ +/*FUNCTION Penta::BasalFrictionCreateInput {{{*/ void Penta::BasalFrictionCreateInput(void){ @@ -225,5 +225,5 @@ } /*}}}*/ -/*FUNCTION Penta::ComputeBasalStress {{{1*/ +/*FUNCTION Penta::ComputeBasalStress {{{*/ void Penta::ComputeBasalStress(Vector* sigma_b){ @@ -315,5 +315,5 @@ } /*}}}*/ -/*FUNCTION Penta::ComputeStrainRate {{{1*/ +/*FUNCTION Penta::ComputeStrainRate {{{*/ void Penta::ComputeStrainRate(Vector* eps){ @@ -322,5 +322,5 @@ } /*}}}*/ -/*FUNCTION Penta::ComputeStressTensor {{{1*/ +/*FUNCTION Penta::ComputeStressTensor {{{*/ void Penta::ComputeStressTensor(){ @@ -377,5 +377,5 @@ } /*}}}*/ - /*FUNCTION Penta::Configure {{{1*/ + /*FUNCTION Penta::Configure {{{*/ void Penta::Configure(Elements* elementsin, Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){ @@ -409,5 +409,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrix {{{1*/ +/*FUNCTION Penta::CreateKMatrix {{{*/ void Penta::CreateKMatrix(Matrix* Kff, Matrix* Kfs,Vector* df){ @@ -418,5 +418,5 @@ parameters->FindParam(&analysis_type,AnalysisTypeEnum); - /*Checks in debugging {{{2*/ + /*Checks in debugging {{{*/ _assert_(this->nodes && this->matice && this->matpar && this->verticalneighbors && this->parameters && this->inputs); /*}}}*/ @@ -479,5 +479,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixPrognostic {{{1*/ +/*FUNCTION Penta::CreateKMatrixPrognostic {{{*/ ElementMatrix* Penta::CreateKMatrixPrognostic(void){ @@ -500,5 +500,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixSlope {{{1*/ +/*FUNCTION Penta::CreateKMatrixSlope {{{*/ ElementMatrix* Penta::CreateKMatrixSlope(void){ @@ -513,5 +513,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVector {{{1*/ +/*FUNCTION Penta::CreatePVector {{{*/ void Penta::CreatePVector(Vector* pf){ @@ -521,5 +521,5 @@ parameters->FindParam(&analysis_type,AnalysisTypeEnum); - /*if debugging mode, check that all pointers exist {{{2*/ + /*if debugging mode, check that all pointers exist {{{*/ _assert_(this->nodes && this->matice && this->matpar && this->verticalneighbors && this->parameters && this->inputs); /*}}}*/ @@ -579,5 +579,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorPrognostic {{{1*/ +/*FUNCTION Penta::CreatePVectorPrognostic {{{*/ ElementVector* Penta::CreatePVectorPrognostic(void){ @@ -601,5 +601,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorSlope {{{1*/ +/*FUNCTION Penta::CreatePVectorSlope {{{*/ ElementVector* Penta::CreatePVectorSlope(void){ @@ -615,5 +615,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateJacobianMatrix{{{1*/ +/*FUNCTION Penta::CreateJacobianMatrix{{{*/ void Penta::CreateJacobianMatrix(Matrix* Jff){ @@ -623,5 +623,5 @@ parameters->FindParam(&analysis_type,AnalysisTypeEnum); - /*Checks in debugging {{{2*/ + /*Checks in debugging {{{*/ _assert_(this->nodes && this->matice && this->matpar && this->verticalneighbors && this->parameters && this->inputs); /*}}}*/ @@ -648,5 +648,5 @@ } /*}}}*/ -/*FUNCTION Penta::DeepEcho{{{1*/ +/*FUNCTION Penta::DeepEcho{{{*/ void Penta::DeepEcho(void){ @@ -676,5 +676,5 @@ } /*}}}*/ -/*FUNCTION Penta::DeleteResults {{{1*/ +/*FUNCTION Penta::DeleteResults {{{*/ void Penta::DeleteResults(void){ @@ -685,5 +685,5 @@ } /*}}}*/ -/*FUNCTION Penta::Echo{{{1*/ +/*FUNCTION Penta::Echo{{{*/ void Penta::Echo(void){ @@ -691,5 +691,5 @@ } /*}}}*/ -/*FUNCTION Penta::ObjectEnum{{{1*/ +/*FUNCTION Penta::ObjectEnum{{{*/ int Penta::ObjectEnum(void){ @@ -698,5 +698,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetBasalElement{{{1*/ +/*FUNCTION Penta::GetBasalElement{{{*/ Penta* Penta::GetBasalElement(void){ @@ -719,5 +719,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetDofList {{{1*/ +/*FUNCTION Penta::GetDofList {{{*/ void Penta::GetDofList(int** pdoflist,int approximation_enum,int setenum){ @@ -743,5 +743,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetDofList1 {{{1*/ +/*FUNCTION Penta::GetDofList1 {{{*/ void Penta::GetDofList1(int* doflist){ @@ -751,10 +751,10 @@ } /*}}}*/ -/*FUNCTION Penta::GetConnectivityList {{{1*/ +/*FUNCTION Penta::GetConnectivityList {{{*/ void Penta::GetConnectivityList(int* connectivity){ for(int i=0;iGetConnectivity(); } /*}}}*/ -/*FUNCTION Penta::GetElementType {{{1*/ +/*FUNCTION Penta::GetElementType {{{*/ int Penta::GetElementType(){ @@ -763,5 +763,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetElementSizes{{{1*/ +/*FUNCTION Penta::GetElementSizes{{{*/ void Penta::GetElementSizes(double* hx,double* hy,double* hz){ @@ -790,5 +790,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetHorizontalNeighboorSids {{{1*/ +/*FUNCTION Penta::GetHorizontalNeighboorSids {{{*/ int* Penta::GetHorizontalNeighboorSids(){ @@ -798,5 +798,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetLowerElement{{{1*/ +/*FUNCTION Penta::GetLowerElement{{{*/ Penta* Penta::GetLowerElement(void){ @@ -808,5 +808,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetNodeIndex {{{1*/ +/*FUNCTION Penta::GetNodeIndex {{{*/ int Penta::GetNodeIndex(Node* node){ @@ -820,5 +820,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetInputListOnVertices(double* pvalue,int enumtype) {{{1*/ +/*FUNCTION Penta::GetInputListOnVertices(double* pvalue,int enumtype) {{{*/ void Penta::GetInputListOnVertices(double* pvalue,int enumtype){ @@ -845,5 +845,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{1*/ +/*FUNCTION Penta::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{*/ void Penta::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue){ @@ -874,5 +874,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetInputValue(double* pvalue,Node* node,int enumtype) {{{1*/ +/*FUNCTION Penta::GetInputValue(double* pvalue,Node* node,int enumtype) {{{*/ void Penta::GetInputValue(double* pvalue,Node* node,int enumtype){ @@ -887,5 +887,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetPhi {{{1*/ +/*FUNCTION Penta::GetPhi {{{*/ void Penta::GetPhi(double* phi, double* epsilon, double viscosity){ /*Compute deformational heating from epsilon and viscosity */ @@ -925,5 +925,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSidList{{{1*/ +/*FUNCTION Penta::GetSidList{{{*/ void Penta::GetSidList(int* sidlist){ @@ -933,5 +933,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputs{{{1*/ +/*FUNCTION Penta::GetSolutionFromInputs{{{*/ void Penta::GetSolutionFromInputs(Vector* solution){ @@ -977,5 +977,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetStabilizationParameter {{{1*/ +/*FUNCTION Penta::GetStabilizationParameter {{{*/ double Penta::GetStabilizationParameter(double u, double v, double w, double diameter, double kappa){ /*Compute stabilization parameter*/ @@ -995,5 +995,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetStrainRate3dPattyn{{{1*/ +/*FUNCTION Penta::GetStrainRate3dPattyn{{{*/ void Penta::GetStrainRate3dPattyn(double* epsilon,double* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input){ /*Compute the 3d Blatter/PattynStrain Rate (5 components): @@ -1024,5 +1024,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetStrainRate3d{{{1*/ +/*FUNCTION Penta::GetStrainRate3d{{{*/ void Penta::GetStrainRate3d(double* epsilon,double* xyz_list, GaussPenta* gauss, Input* vx_input, Input* vy_input, Input* vz_input){ /*Compute the 3d Strain Rate (6 components): @@ -1050,5 +1050,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetUpperElement{{{1*/ +/*FUNCTION Penta::GetUpperElement{{{*/ Penta* Penta::GetUpperElement(void){ @@ -1060,5 +1060,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetVectorFromInputs{{{1*/ +/*FUNCTION Penta::GetVectorFromInputs{{{*/ void Penta::GetVectorFromInputs(Vector* vector,int input_enum){ @@ -1079,5 +1079,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetVectorFromResults{{{1*/ +/*FUNCTION Penta::GetVectorFromResults{{{*/ void Penta::GetVectorFromResults(Vector* vector,int offset,int interp){ @@ -1099,5 +1099,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetZcoord {{{1*/ +/*FUNCTION Penta::GetZcoord {{{*/ double Penta::GetZcoord(GaussPenta* gauss){ @@ -1114,5 +1114,5 @@ } /*}}}*/ -/*FUNCTION Penta::Sid {{{1*/ +/*FUNCTION Penta::Sid {{{*/ int Penta::Sid(){ @@ -1121,10 +1121,10 @@ } /*}}}*/ -/*FUNCTION Penta::Id {{{1*/ +/*FUNCTION Penta::Id {{{*/ int Penta::Id(void){ return id; } /*}}}*/ -/*FUNCTION Penta::InputArtificialNoise{{{1*/ +/*FUNCTION Penta::InputArtificialNoise{{{*/ void Penta::InputArtificialNoise(int enum_type,double min,double max){ @@ -1139,5 +1139,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputConvergence{{{1*/ +/*FUNCTION Penta::InputConvergence{{{*/ bool Penta::InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){ @@ -1171,5 +1171,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputCreate(double scalar,int enum,int code);{{{1*/ +/*FUNCTION Penta::InputCreate(double scalar,int enum,int code);{{{*/ void Penta::InputCreate(double scalar,int name,int code){ @@ -1190,5 +1190,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputCreate(double* vector,int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){{{1*/ +/*FUNCTION Penta::InputCreate(double* vector,int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){{{*/ void Penta::InputCreate(double* vector, int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){//index into elements @@ -1280,5 +1280,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputDepthAverageAtBase{{{1*/ +/*FUNCTION Penta::InputDepthAverageAtBase{{{*/ void Penta::InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum){ @@ -1377,5 +1377,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputDuplicate{{{1*/ +/*FUNCTION Penta::InputDuplicate{{{*/ void Penta::InputDuplicate(int original_enum,int new_enum){ @@ -1385,5 +1385,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputExtrude {{{1*/ +/*FUNCTION Penta::InputExtrude {{{*/ void Penta::InputExtrude(int enum_type,int object_type){ @@ -1457,5 +1457,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputScale{{{1*/ +/*FUNCTION Penta::InputScale{{{*/ void Penta::InputScale(int enum_type,double scale_factor){ @@ -1470,5 +1470,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputToResult{{{1*/ +/*FUNCTION Penta::InputToResult{{{*/ void Penta::InputToResult(int enum_type,int step,double time){ @@ -1495,5 +1495,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromConstant(bool value, int name);{{{1*/ +/*FUNCTION Penta::InputUpdateFromConstant(bool value, int name);{{{*/ void Penta::InputUpdateFromConstant(bool constant, int name){ @@ -1505,5 +1505,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromConstant(double value, int name);{{{1*/ +/*FUNCTION Penta::InputUpdateFromConstant(double value, int name);{{{*/ void Penta::InputUpdateFromConstant(double constant, int name){ /*Check that name is an element input*/ @@ -1514,5 +1514,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromConstant(int value, int name);{{{1*/ +/*FUNCTION Penta::InputUpdateFromConstant(int value, int name);{{{*/ void Penta::InputUpdateFromConstant(int constant, int name){ /*Check that name is an element input*/ @@ -1523,5 +1523,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromIoModel {{{1*/ +/*FUNCTION Penta::InputUpdateFromIoModel {{{*/ void Penta::InputUpdateFromIoModel(int index,IoModel* iomodel){ @@ -1545,5 +1545,5 @@ /*Checks if debuging*/ - /*{{{2*/ + /*{{{*/ _assert_(iomodel->Data(MeshElementsEnum)); /*}}}*/ @@ -1646,5 +1646,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolution {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolution {{{*/ void Penta::InputUpdateFromSolution(double* solution){ @@ -1715,5 +1715,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionPrognostic{{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionPrognostic{{{*/ void Penta::InputUpdateFromSolutionPrognostic(double* solution){ @@ -1798,5 +1798,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionOneDof{{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionOneDof{{{*/ void Penta::InputUpdateFromSolutionOneDof(double* solution,int enum_type){ @@ -1822,5 +1822,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionOneDofCollpased{{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionOneDofCollpased{{{*/ void Penta::InputUpdateFromSolutionOneDofCollapsed(double* solution,int enum_type){ @@ -1862,5 +1862,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromVector(double* vector, int name, int type);{{{1*/ +/*FUNCTION Penta::InputUpdateFromVector(double* vector, int name, int type);{{{*/ void Penta::InputUpdateFromVector(double* vector, int name, int type){ @@ -1892,15 +1892,15 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromVector(int* vector, int name, int type);{{{1*/ +/*FUNCTION Penta::InputUpdateFromVector(int* vector, int name, int type);{{{*/ void Penta::InputUpdateFromVector(int* vector, int name, int type){ _error_(" not supported yet!"); } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromVector(bool* vector, int name, int type);{{{1*/ +/*FUNCTION Penta::InputUpdateFromVector(bool* vector, int name, int type);{{{*/ void Penta::InputUpdateFromVector(bool* vector, int name, int type){ _error_(" not supported yet!"); } /*}}}*/ -/*FUNCTION Penta::IsOnBed{{{1*/ +/*FUNCTION Penta::IsOnBed{{{*/ bool Penta::IsOnBed(void){ @@ -1910,5 +1910,5 @@ } /*}}}*/ -/*FUNCTION Penta::IsInput{{{1*/ +/*FUNCTION Penta::IsInput{{{*/ bool Penta::IsInput(int name){ if ( @@ -1954,5 +1954,5 @@ } /*}}}*/ -/*FUNCTION Penta::IsFloating{{{1*/ +/*FUNCTION Penta::IsFloating{{{*/ bool Penta::IsFloating(){ @@ -1962,5 +1962,5 @@ } /*}}}*/ -/*FUNCTION Penta::IsNodeOnShelf {{{1*/ +/*FUNCTION Penta::IsNodeOnShelf {{{*/ bool Penta::IsNodeOnShelf(){ @@ -1977,5 +1977,5 @@ } /*}}}*/ -/*FUNCTION Penta::IsNodeOnShelfFromFlags {{{1*/ +/*FUNCTION Penta::IsNodeOnShelfFromFlags {{{*/ bool Penta::IsNodeOnShelfFromFlags(double* flags){ @@ -1992,5 +1992,5 @@ } /*}}}*/ -/*FUNCTION Penta::IsOnSurface{{{1*/ +/*FUNCTION Penta::IsOnSurface{{{*/ bool Penta::IsOnSurface(void){ @@ -2000,5 +2000,5 @@ } /*}}}*/ -/*FUNCTION Penta::IsOnWater {{{1*/ +/*FUNCTION Penta::IsOnWater {{{*/ bool Penta::IsOnWater(){ @@ -2059,5 +2059,5 @@ }/*}}}*/ -/*FUNCTION Penta::MigrateGroundingLine{{{1*/ +/*FUNCTION Penta::MigrateGroundingLine{{{*/ void Penta::MigrateGroundingLine(double* old_floating_ice,double* sheet_ungrounding){ @@ -2142,5 +2142,5 @@ } /*}}}*/ -/*FUNCTION Penta::MinEdgeLength{{{1*/ +/*FUNCTION Penta::MinEdgeLength{{{*/ double Penta::MinEdgeLength(double xyz_list[6][3]){ /*Return the minimum lenght of the nine egdes of the penta*/ @@ -2164,5 +2164,5 @@ } /*}}}*/ -/*FUNCTION Penta::MyRank {{{1*/ +/*FUNCTION Penta::MyRank {{{*/ int Penta::MyRank(void){ extern int my_rank; @@ -2170,5 +2170,5 @@ } /*}}}*/ -/*FUNCTION Penta::NodalValue {{{1*/ +/*FUNCTION Penta::NodalValue {{{*/ int Penta::NodalValue(double* pvalue, int index, int natureofdataenum,bool process_units){ @@ -2201,5 +2201,5 @@ } /*}}}*/ -/*FUNCTION Penta::PatchFill{{{1*/ +/*FUNCTION Penta::PatchFill{{{*/ void Penta::PatchFill(int* pcount, Patch* patch){ @@ -2228,5 +2228,5 @@ *pcount=count; }/*}}}*/ -/*FUNCTION Penta::PatchSize{{{1*/ +/*FUNCTION Penta::PatchSize{{{*/ void Penta::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){ @@ -2252,5 +2252,5 @@ } /*}}}*/ -/*FUNCTION Penta::PositiveDegreeDay{{{1*/ +/*FUNCTION Penta::PositiveDegreeDay{{{*/ void Penta::PositiveDegreeDay(double* pdds,double* pds,double signorm){ @@ -2477,5 +2477,5 @@ } /*}}}*/ -/*FUNCTION Penta::PotentialSheetUngrounding{{{1*/ +/*FUNCTION Penta::PotentialSheetUngrounding{{{*/ void Penta::PotentialSheetUngrounding(Vector* potential_sheet_ungrounding){ @@ -2506,5 +2506,5 @@ } /*}}}*/ -/*FUNCTION Penta::ProcessResultsUnits{{{1*/ +/*FUNCTION Penta::ProcessResultsUnits{{{*/ void Penta::ProcessResultsUnits(void){ @@ -2517,5 +2517,5 @@ } /*}}}*/ -/*FUNCTION Penta::ReduceMatrixStokes {{{1*/ +/*FUNCTION Penta::ReduceMatrixStokes {{{*/ void Penta::ReduceMatrixStokes(double* Ke_reduced, double* Ke_temp){ @@ -2559,5 +2559,5 @@ } /*}}}*/ -/*FUNCTION Penta::ReduceVectorStokes {{{1*/ +/*FUNCTION Penta::ReduceVectorStokes {{{*/ void Penta::ReduceVectorStokes(double* Pe_reduced, double* Ke_temp, double* Pe_temp){ @@ -2594,5 +2594,5 @@ } /*}}}*/ -/*FUNCTION Penta::RequestedOutput{{{1*/ +/*FUNCTION Penta::RequestedOutput{{{*/ void Penta::RequestedOutput(int output_enum,int step,double time){ @@ -2645,5 +2645,5 @@ } /*}}}*/ -/*FUNCTION Penta::ResetCoordinateSystem{{{1*/ +/*FUNCTION Penta::ResetCoordinateSystem{{{*/ void Penta::ResetCoordinateSystem(void){ @@ -2673,11 +2673,11 @@ } /*}}}*/ -/*FUNCTION Penta::SetClone {{{1*/ +/*FUNCTION Penta::SetClone {{{*/ void Penta::SetClone(int* minranks){ _error_("not implemented yet"); } -/*}}}1*/ -/*FUNCTION Penta::SetCurrentConfiguration {{{1*/ +/*}}}*/ +/*FUNCTION Penta::SetCurrentConfiguration {{{*/ void Penta::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){ @@ -2695,5 +2695,5 @@ } /*}}}*/ -/*FUNCTION Penta::SpawnTria {{{1*/ +/*FUNCTION Penta::SpawnTria {{{*/ Tria* Penta::SpawnTria(int g0, int g1, int g2){ @@ -2738,5 +2738,5 @@ } /*}}}*/ -/*FUNCTION Penta::SurfaceArea {{{1*/ +/*FUNCTION Penta::SurfaceArea {{{*/ double Penta::SurfaceArea(void){ @@ -2775,5 +2775,5 @@ } /*}}}*/ -/*FUNCTION Penta::SurfaceNormal {{{1*/ +/*FUNCTION Penta::SurfaceNormal {{{*/ void Penta::SurfaceNormal(double* surface_normal, double xyz_list[3][3]){ @@ -2799,5 +2799,5 @@ } /*}}}*/ -/*FUNCTION Penta::TimeAdapt{{{1*/ +/*FUNCTION Penta::TimeAdapt{{{*/ double Penta::TimeAdapt(void){ @@ -2843,5 +2843,5 @@ return dt; } -/*FUNCTION Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type) {{{1*/ +/*FUNCTION Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type) {{{*/ void Penta::Update(int index,IoModel* iomodel,int analysis_counter,int analysis_type){ @@ -2870,5 +2870,5 @@ /*Checks if debuging*/ - /*{{{2*/ + /*{{{*/ _assert_(iomodel->Data(MeshElementsEnum)); /*}}}*/ @@ -2997,5 +2997,5 @@ } /*}}}*/ -/*FUNCTION Penta::UpdatePotentialSheetUngrounding{{{1*/ +/*FUNCTION Penta::UpdatePotentialSheetUngrounding{{{*/ int Penta::UpdatePotentialSheetUngrounding(double* vertices_potentially_ungrounding,Vector* vec_nodes_on_iceshelf,double* nodes_on_iceshelf){ @@ -3017,5 +3017,5 @@ } /*}}}*/ -/*FUNCTION Penta::ViscousHeatingCreateInput {{{1*/ +/*FUNCTION Penta::ViscousHeatingCreateInput {{{*/ void Penta::ViscousHeatingCreateInput(void){ @@ -3065,12 +3065,12 @@ } /*}}}*/ -/*FUNCTION Penta::SmearFunction {{{1*/ +/*FUNCTION Penta::SmearFunction {{{*/ void Penta::SmearFunction(Vector* smearedvector,double (*WeightFunction)(double distance,double radius),double radius){ _error_("not implemented yet"); } -/*}}}1*/ +/*}}}*/ #ifdef _HAVE_RESPONSES_ -/*FUNCTION Penta::IceVolume {{{1*/ +/*FUNCTION Penta::IceVolume {{{*/ double Penta::IceVolume(void){ @@ -3095,5 +3095,5 @@ } /*}}}*/ -/*FUNCTION Penta::MinVel{{{1*/ +/*FUNCTION Penta::MinVel{{{*/ void Penta::MinVel(double* pminvel, bool process_units){ @@ -3108,5 +3108,5 @@ } /*}}}*/ -/*FUNCTION Penta::MinVx{{{1*/ +/*FUNCTION Penta::MinVx{{{*/ void Penta::MinVx(double* pminvx, bool process_units){ @@ -3121,5 +3121,5 @@ } /*}}}*/ -/*FUNCTION Penta::MinVy{{{1*/ +/*FUNCTION Penta::MinVy{{{*/ void Penta::MinVy(double* pminvy, bool process_units){ @@ -3134,5 +3134,5 @@ } /*}}}*/ -/*FUNCTION Penta::MinVz{{{1*/ +/*FUNCTION Penta::MinVz{{{*/ void Penta::MinVz(double* pminvz, bool process_units){ @@ -3147,5 +3147,5 @@ } /*}}}*/ -/*FUNCTION Penta::MassFlux {{{1*/ +/*FUNCTION Penta::MassFlux {{{*/ double Penta::MassFlux( double* segment,bool process_units){ @@ -3171,5 +3171,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxAbsVx{{{1*/ +/*FUNCTION Penta::MaxAbsVx{{{*/ void Penta::MaxAbsVx(double* pmaxabsvx, bool process_units){ @@ -3184,5 +3184,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxAbsVy{{{1*/ +/*FUNCTION Penta::MaxAbsVy{{{*/ void Penta::MaxAbsVy(double* pmaxabsvy, bool process_units){ @@ -3197,5 +3197,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxAbsVz{{{1*/ +/*FUNCTION Penta::MaxAbsVz{{{*/ void Penta::MaxAbsVz(double* pmaxabsvz, bool process_units){ @@ -3210,5 +3210,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxVel{{{1*/ +/*FUNCTION Penta::MaxVel{{{*/ void Penta::MaxVel(double* pmaxvel, bool process_units){ @@ -3224,5 +3224,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxVx{{{1*/ +/*FUNCTION Penta::MaxVx{{{*/ void Penta::MaxVx(double* pmaxvx, bool process_units){ @@ -3237,5 +3237,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxVy{{{1*/ +/*FUNCTION Penta::MaxVy{{{*/ void Penta::MaxVy(double* pmaxvy, bool process_units){ @@ -3250,5 +3250,5 @@ } /*}}}*/ -/*FUNCTION Penta::MaxVz{{{1*/ +/*FUNCTION Penta::MaxVz{{{*/ void Penta::MaxVz(double* pmaxvz, bool process_units){ @@ -3263,5 +3263,5 @@ } /*}}}*/ -/*FUNCTION Penta::ElementResponse{{{1*/ +/*FUNCTION Penta::ElementResponse{{{*/ void Penta::ElementResponse(double* presponse,int response_enum,bool process_units){ @@ -3293,5 +3293,5 @@ #ifdef _HAVE_THERMAL_ -/*FUNCTION Penta::CreateKMatrixEnthalpy {{{1*/ +/*FUNCTION Penta::CreateKMatrixEnthalpy {{{*/ ElementMatrix* Penta::CreateKMatrixEnthalpy(void){ @@ -3307,5 +3307,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixEnthalpyVolume {{{1*/ +/*FUNCTION Penta::CreateKMatrixEnthalpyVolume {{{*/ ElementMatrix* Penta::CreateKMatrixEnthalpyVolume(void){ @@ -3464,5 +3464,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixEnthalpyShelf {{{1*/ +/*FUNCTION Penta::CreateKMatrixEnthalpyShelf {{{*/ ElementMatrix* Penta::CreateKMatrixEnthalpyShelf(void){ @@ -3518,5 +3518,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixMelting {{{1*/ +/*FUNCTION Penta::CreateKMatrixMelting {{{*/ ElementMatrix* Penta::CreateKMatrixMelting(void){ @@ -3530,5 +3530,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixThermal {{{1*/ +/*FUNCTION Penta::CreateKMatrixThermal {{{*/ ElementMatrix* Penta::CreateKMatrixThermal(void){ @@ -3544,5 +3544,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixThermalVolume {{{1*/ +/*FUNCTION Penta::CreateKMatrixThermalVolume {{{*/ ElementMatrix* Penta::CreateKMatrixThermalVolume(void){ @@ -3696,5 +3696,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixThermalShelf {{{1*/ +/*FUNCTION Penta::CreateKMatrixThermalShelf {{{*/ ElementMatrix* Penta::CreateKMatrixThermalShelf(void){ @@ -3751,5 +3751,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorEnthalpy {{{1*/ +/*FUNCTION Penta::CreatePVectorEnthalpy {{{*/ ElementVector* Penta::CreatePVectorEnthalpy(void){ @@ -3767,5 +3767,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorEnthalpyVolume {{{1*/ +/*FUNCTION Penta::CreatePVectorEnthalpyVolume {{{*/ ElementVector* Penta::CreatePVectorEnthalpyVolume(void){ @@ -3863,5 +3863,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorEnthalpyShelf {{{1*/ +/*FUNCTION Penta::CreatePVectorEnthalpyShelf {{{*/ ElementVector* Penta::CreatePVectorEnthalpyShelf(void){ @@ -3920,5 +3920,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorEnthalpySheet {{{1*/ +/*FUNCTION Penta::CreatePVectorEnthalpySheet {{{*/ ElementVector* Penta::CreatePVectorEnthalpySheet(void){ @@ -4009,10 +4009,10 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorMelting {{{1*/ +/*FUNCTION Penta::CreatePVectorMelting {{{*/ ElementVector* Penta::CreatePVectorMelting(void){ return NULL; } /*}}}*/ -/*FUNCTION Penta::CreatePVectorThermal {{{1*/ +/*FUNCTION Penta::CreatePVectorThermal {{{*/ ElementVector* Penta::CreatePVectorThermal(void){ @@ -4030,5 +4030,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorThermalVolume {{{1*/ +/*FUNCTION Penta::CreatePVectorThermalVolume {{{*/ ElementVector* Penta::CreatePVectorThermalVolume(void){ @@ -4117,5 +4117,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorThermalShelf {{{1*/ +/*FUNCTION Penta::CreatePVectorThermalShelf {{{*/ ElementVector* Penta::CreatePVectorThermalShelf(void){ @@ -4174,5 +4174,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorThermalSheet {{{1*/ +/*FUNCTION Penta::CreatePVectorThermalSheet {{{*/ ElementVector* Penta::CreatePVectorThermalSheet(void){ @@ -4241,5 +4241,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsThermal{{{1*/ +/*FUNCTION Penta::GetSolutionFromInputsThermal{{{*/ void Penta::GetSolutionFromInputsThermal(Vector* solution){ @@ -4272,5 +4272,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsEnthalpy{{{1*/ +/*FUNCTION Penta::GetSolutionFromInputsEnthalpy{{{*/ void Penta::GetSolutionFromInputsEnthalpy(Vector* solution){ @@ -4303,5 +4303,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionThermal {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionThermal {{{*/ void Penta::InputUpdateFromSolutionThermal(double* solution){ @@ -4374,5 +4374,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionEnthalpy {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionEnthalpy {{{*/ void Penta::InputUpdateFromSolutionEnthalpy(double* solution){ @@ -4455,5 +4455,5 @@ #ifdef _HAVE_CONTROL_ -/*FUNCTION Penta::ControlInputGetGradient{{{1*/ +/*FUNCTION Penta::ControlInputGetGradient{{{*/ void Penta::ControlInputGetGradient(Vector* gradient,int enum_type,int control_index){ @@ -4475,5 +4475,5 @@ }/*}}}*/ -/*FUNCTION Penta::ControlInputScaleGradient{{{1*/ +/*FUNCTION Penta::ControlInputScaleGradient{{{*/ void Penta::ControlInputScaleGradient(int enum_type,double scale){ @@ -4491,5 +4491,5 @@ ((ControlInput*)input)->ScaleGradient(scale); }/*}}}*/ -/*FUNCTION Penta::ControlInputSetGradient{{{1*/ +/*FUNCTION Penta::ControlInputSetGradient{{{*/ void Penta::ControlInputSetGradient(double* gradient,int enum_type,int control_index){ @@ -4514,5 +4514,5 @@ }/*}}}*/ -/*FUNCTION Penta::CreateKMatrixAdjointHoriz{{{1*/ +/*FUNCTION Penta::CreateKMatrixAdjointHoriz{{{*/ ElementMatrix* Penta::CreateKMatrixAdjointHoriz(void){ @@ -4534,5 +4534,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixAdjointMacAyeal2d{{{1*/ +/*FUNCTION Penta::CreateKMatrixAdjointMacAyeal2d{{{*/ ElementMatrix* Penta::CreateKMatrixAdjointMacAyeal2d(void){ @@ -4557,5 +4557,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixAdjointPattyn{{{1*/ +/*FUNCTION Penta::CreateKMatrixAdjointPattyn{{{*/ ElementMatrix* Penta::CreateKMatrixAdjointPattyn(void){ @@ -4625,5 +4625,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixAdjointStokes{{{1*/ +/*FUNCTION Penta::CreateKMatrixAdjointStokes{{{*/ ElementMatrix* Penta::CreateKMatrixAdjointStokes(void){ @@ -4704,5 +4704,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorAdjointHoriz{{{1*/ +/*FUNCTION Penta::CreatePVectorAdjointHoriz{{{*/ ElementVector* Penta::CreatePVectorAdjointHoriz(void){ @@ -4724,5 +4724,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorAdjointMacAyeal{{{1*/ +/*FUNCTION Penta::CreatePVectorAdjointMacAyeal{{{*/ ElementVector* Penta::CreatePVectorAdjointMacAyeal(){ @@ -4738,5 +4738,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorAdjointPattyn{{{1*/ +/*FUNCTION Penta::CreatePVectorAdjointPattyn{{{*/ ElementVector* Penta::CreatePVectorAdjointPattyn(void){ @@ -4752,5 +4752,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorAdjointStokes{{{1*/ +/*FUNCTION Penta::CreatePVectorAdjointStokes{{{*/ ElementVector* Penta::CreatePVectorAdjointStokes(void){ @@ -4766,5 +4766,5 @@ } /*}}}*/ -/*FUNCTION Penta::GradientIndexing{{{1*/ +/*FUNCTION Penta::GradientIndexing{{{*/ void Penta::GradientIndexing(int* indexing,int control_index){ @@ -4780,5 +4780,5 @@ } /*}}}*/ -/*FUNCTION Penta::Gradj {{{1*/ +/*FUNCTION Penta::Gradj {{{*/ void Penta::Gradj(Vector* gradient,int control_type,int control_index){ /*dJ/dalpha = ∂L/∂alpha = ∂J/∂alpha + ∂/∂alpha(KU-F)*/ @@ -4871,5 +4871,5 @@ } /*}}}*/ -/*FUNCTION Penta::GradjDragMacAyeal {{{1*/ +/*FUNCTION Penta::GradjDragMacAyeal {{{*/ void Penta::GradjDragMacAyeal(Vector* gradient,int control_index){ @@ -4883,5 +4883,5 @@ } /*}}}*/ -/*FUNCTION Penta::GradjDragPattyn {{{1*/ +/*FUNCTION Penta::GradjDragPattyn {{{*/ void Penta::GradjDragPattyn(Vector* gradient,int control_index){ @@ -4954,5 +4954,5 @@ } /*}}}*/ -/*FUNCTION Penta::GradjDragStokes {{{1*/ +/*FUNCTION Penta::GradjDragStokes {{{*/ void Penta::GradjDragStokes(Vector* gradient,int control_index){ @@ -5046,5 +5046,5 @@ } /*}}}*/ -/*FUNCTION Penta::GradjBbarMacAyeal {{{1*/ +/*FUNCTION Penta::GradjBbarMacAyeal {{{*/ void Penta::GradjBbarMacAyeal(Vector* gradient,int control_index){ @@ -5064,5 +5064,5 @@ } /*}}}*/ -/*FUNCTION Penta::GradjBbarPattyn {{{1*/ +/*FUNCTION Penta::GradjBbarPattyn {{{*/ void Penta::GradjBbarPattyn(Vector* gradient,int control_index){ @@ -5081,5 +5081,5 @@ this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum); } /*}}}*/ -/*FUNCTION Penta::GradjBbarStokes {{{1*/ +/*FUNCTION Penta::GradjBbarStokes {{{*/ void Penta::GradjBbarStokes(Vector* gradient,int control_index){ @@ -5098,5 +5098,5 @@ this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum); } /*}}}*/ -/*FUNCTION Penta::InputControlUpdate{{{1*/ +/*FUNCTION Penta::InputControlUpdate{{{*/ void Penta::InputControlUpdate(double scalar,bool save_parameter){ @@ -5136,5 +5136,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionAdjointStokes {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionAdjointStokes {{{*/ void Penta::InputUpdateFromSolutionAdjointStokes(double* solution){ @@ -5179,5 +5179,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionAdjointHoriz {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionAdjointHoriz {{{*/ void Penta::InputUpdateFromSolutionAdjointHoriz(double* solution){ @@ -5214,5 +5214,5 @@ } /*}}}*/ -/*FUNCTION Penta::SurfaceAverageVelMisfit {{{1*/ +/*FUNCTION Penta::SurfaceAverageVelMisfit {{{*/ double Penta::SurfaceAverageVelMisfit(bool process_units,int weight_index){ @@ -5251,5 +5251,5 @@ } /*}}}*/ -/*FUNCTION Penta::SurfaceAbsVelMisfit {{{1*/ +/*FUNCTION Penta::SurfaceAbsVelMisfit {{{*/ double Penta::SurfaceAbsVelMisfit(bool process_units,int weight_index){ @@ -5288,5 +5288,5 @@ } /*}}}*/ -/*FUNCTION Penta::SurfaceLogVelMisfit {{{1*/ +/*FUNCTION Penta::SurfaceLogVelMisfit {{{*/ double Penta::SurfaceLogVelMisfit(bool process_units,int weight_index){ @@ -5325,5 +5325,5 @@ } /*}}}*/ -/*FUNCTION Penta::SurfaceLogVxVyMisfit {{{1*/ +/*FUNCTION Penta::SurfaceLogVxVyMisfit {{{*/ double Penta::SurfaceLogVxVyMisfit(bool process_units,int weight_index){ @@ -5364,5 +5364,5 @@ } /*}}}*/ -/*FUNCTION Penta::SurfaceRelVelMisfit {{{1*/ +/*FUNCTION Penta::SurfaceRelVelMisfit {{{*/ double Penta::SurfaceRelVelMisfit(bool process_units,int weight_index){ @@ -5401,5 +5401,5 @@ } /*}}}*/ -/*FUNCTION Penta::ThicknessAbsGradient{{{1*/ +/*FUNCTION Penta::ThicknessAbsGradient{{{*/ double Penta::ThicknessAbsGradient(bool process_units,int weight_index){ @@ -5407,5 +5407,5 @@ } /*}}}*/ -/*FUNCTION Penta::ThicknessAbsMisfit {{{1*/ +/*FUNCTION Penta::ThicknessAbsMisfit {{{*/ double Penta::ThicknessAbsMisfit(bool process_units,int weight_index){ @@ -5427,5 +5427,5 @@ } /*}}}*/ -/*FUNCTION Penta::DragCoefficientAbsGradient{{{1*/ +/*FUNCTION Penta::DragCoefficientAbsGradient{{{*/ double Penta::DragCoefficientAbsGradient(bool process_units,int weight_index){ @@ -5442,5 +5442,5 @@ } /*}}}*/ -/*FUNCTION Penta::RheologyBbarAbsGradient{{{1*/ +/*FUNCTION Penta::RheologyBbarAbsGradient{{{*/ double Penta::RheologyBbarAbsGradient(bool process_units,int weight_index){ @@ -5457,5 +5457,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetVectorFromControlInputs{{{1*/ +/*FUNCTION Penta::GetVectorFromControlInputs{{{*/ void Penta::GetVectorFromControlInputs(Vector* vector,int control_enum,int control_index,const char* data){ @@ -5480,5 +5480,5 @@ } /*}}}*/ -/*FUNCTION Penta::SetControlInputsFromVector{{{1*/ +/*FUNCTION Penta::SetControlInputsFromVector{{{*/ void Penta::SetControlInputsFromVector(double* vector,int control_enum,int control_index){ @@ -5518,5 +5518,5 @@ #ifdef _HAVE_DAKOTA_ -/*FUNCTION Penta::InputUpdateFromVectorDakota(double* vector, int name, int type);{{{1*/ +/*FUNCTION Penta::InputUpdateFromVectorDakota(double* vector, int name, int type);{{{*/ void Penta::InputUpdateFromVectorDakota(double* vector, int name, int type){ @@ -5541,5 +5541,5 @@ switch(name){ case ThicknessEnum: - /*Update thickness + surface: assume bed is constant. On ice shelves, takes hydrostatic equilibrium {{{2*/ + /*Update thickness + surface: assume bed is constant. On ice shelves, takes hydrostatic equilibrium {{{*/ double thickness[6]; double thickness_init[6]; @@ -5620,15 +5620,15 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{1*/ +/*FUNCTION Penta::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{*/ void Penta::InputUpdateFromVectorDakota(int* vector, int name, int type){ _error_(" not supported yet!"); } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{1*/ +/*FUNCTION Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{*/ void Penta::InputUpdateFromVectorDakota(bool* vector, int name, int type){ _error_(" not supported yet!"); } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type);{{{1*/ +/*FUNCTION Penta::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type);{{{*/ void Penta::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type){ @@ -5678,5 +5678,5 @@ #ifdef _HAVE_DIAGNOSTIC_ -/*FUNCTION Penta::CreateDVectorDiagnosticHoriz {{{1*/ +/*FUNCTION Penta::CreateDVectorDiagnosticHoriz {{{*/ ElementVector* Penta::CreateDVectorDiagnosticHoriz(void){ @@ -5692,5 +5692,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateDVectorDiagnosticStokes{{{1*/ +/*FUNCTION Penta::CreateDVectorDiagnosticStokes{{{*/ ElementVector* Penta::CreateDVectorDiagnosticStokes(void){ @@ -5717,5 +5717,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattyn{{{1*/ +/*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattyn{{{*/ ElementMatrix* Penta::CreateKMatrixCouplingMacAyealPattyn(void){ @@ -5731,5 +5731,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattynViscous{{{1*/ +/*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattynViscous{{{*/ ElementMatrix* Penta::CreateKMatrixCouplingMacAyealPattynViscous(void){ @@ -5824,5 +5824,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattynFriction{{{1*/ +/*FUNCTION Penta::CreateKMatrixCouplingMacAyealPattynFriction{{{*/ ElementMatrix* Penta::CreateKMatrixCouplingMacAyealPattynFriction(void){ @@ -5922,5 +5922,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokes{{{1*/ +/*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokes{{{*/ ElementMatrix* Penta::CreateKMatrixCouplingMacAyealStokes(void){ @@ -5936,5 +5936,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokesViscous{{{1*/ +/*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokesViscous{{{*/ ElementMatrix* Penta::CreateKMatrixCouplingMacAyealStokesViscous(void){ @@ -6040,5 +6040,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokesFriction {{{1*/ +/*FUNCTION Penta::CreateKMatrixCouplingMacAyealStokesFriction {{{*/ ElementMatrix* Penta::CreateKMatrixCouplingMacAyealStokesFriction(void){ @@ -6156,5 +6156,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingPattynStokes{{{1*/ +/*FUNCTION Penta::CreateKMatrixCouplingPattynStokes{{{*/ ElementMatrix* Penta::CreateKMatrixCouplingPattynStokes(void){ @@ -6205,5 +6205,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticHoriz {{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticHoriz {{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticHoriz(void){ @@ -6233,5 +6233,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticHutter{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticHutter{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticHutter(void){ @@ -6296,5 +6296,5 @@ return Ke; } -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal2d{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal2d{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal2d(void){ @@ -6319,5 +6319,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3d{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3d{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal3d(void){ @@ -6333,5 +6333,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3dViscous{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3dViscous{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal3dViscous(void){ @@ -6421,5 +6421,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3dFriction{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3dFriction{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal3dFriction(void){ @@ -6438,5 +6438,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyealPattyn{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyealPattyn{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyealPattyn(void){ @@ -6454,5 +6454,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyealStokes{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyealStokes{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyealStokes(void){ @@ -6470,5 +6470,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticPattyn{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticPattyn{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticPattyn(void){ @@ -6485,5 +6485,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticPattynViscous{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticPattynViscous{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticPattynViscous(void){ @@ -6550,5 +6550,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticPattynFriction{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticPattynFriction{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticPattynFriction(void){ @@ -6625,5 +6625,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticPattynStokes{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticPattynStokes{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticPattynStokes(void){ @@ -6641,5 +6641,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticStokes{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticStokes{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticStokes(void){ @@ -6655,5 +6655,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticStokesViscous {{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticStokesViscous {{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticStokesViscous(void){ @@ -6716,5 +6716,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticStokesFriction{{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticStokesFriction{{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticStokesFriction(void){ @@ -6788,5 +6788,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticVert {{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticVert {{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticVert(void){ @@ -6803,5 +6803,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticVertVolume {{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticVertVolume {{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticVertVolume(void){ @@ -6847,5 +6847,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticVertSurface {{{1*/ +/*FUNCTION Penta::CreateKMatrixDiagnosticVertSurface {{{*/ ElementMatrix* Penta::CreateKMatrixDiagnosticVertSurface(void){ @@ -6894,5 +6894,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingMacAyealStokes {{{1*/ +/*FUNCTION Penta::CreatePVectorCouplingMacAyealStokes {{{*/ ElementVector* Penta::CreatePVectorCouplingMacAyealStokes(void){ @@ -6908,5 +6908,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingMacAyealStokesViscous {{{1*/ +/*FUNCTION Penta::CreatePVectorCouplingMacAyealStokesViscous {{{*/ ElementVector* Penta::CreatePVectorCouplingMacAyealStokesViscous(void){ @@ -6970,5 +6970,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingMacAyealStokesFriction{{{1*/ +/*FUNCTION Penta::CreatePVectorCouplingMacAyealStokesFriction{{{*/ ElementVector* Penta::CreatePVectorCouplingMacAyealStokesFriction(void){ @@ -7045,5 +7045,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingPattynStokes {{{1*/ +/*FUNCTION Penta::CreatePVectorCouplingPattynStokes {{{*/ ElementVector* Penta::CreatePVectorCouplingPattynStokes(void){ @@ -7059,5 +7059,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingPattynStokesViscous {{{1*/ +/*FUNCTION Penta::CreatePVectorCouplingPattynStokesViscous {{{*/ ElementVector* Penta::CreatePVectorCouplingPattynStokesViscous(void){ @@ -7121,5 +7121,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingPattynStokesFriction{{{1*/ +/*FUNCTION Penta::CreatePVectorCouplingPattynStokesFriction{{{*/ ElementVector* Penta::CreatePVectorCouplingPattynStokesFriction(void){ @@ -7196,5 +7196,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticHoriz{{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticHoriz{{{*/ ElementVector* Penta::CreatePVectorDiagnosticHoriz(void){ @@ -7224,5 +7224,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticMacAyealPattyn{{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticMacAyealPattyn{{{*/ ElementVector* Penta::CreatePVectorDiagnosticMacAyealPattyn(void){ @@ -7238,5 +7238,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticMacAyealStokes{{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticMacAyealStokes{{{*/ ElementVector* Penta::CreatePVectorDiagnosticMacAyealStokes(void){ @@ -7254,5 +7254,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticPattynStokes{{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticPattynStokes{{{*/ ElementVector* Penta::CreatePVectorDiagnosticPattynStokes(void){ @@ -7270,5 +7270,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticHutter{{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticHutter{{{*/ ElementVector* Penta::CreatePVectorDiagnosticHutter(void){ @@ -7358,5 +7358,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticMacAyeal{{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticMacAyeal{{{*/ ElementVector* Penta::CreatePVectorDiagnosticMacAyeal(void){ @@ -7372,5 +7372,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticPattyn{{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticPattyn{{{*/ ElementVector* Penta::CreatePVectorDiagnosticPattyn(void){ @@ -7420,5 +7420,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticStokes {{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticStokes {{{*/ ElementVector* Penta::CreatePVectorDiagnosticStokes(void){ @@ -7434,5 +7434,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticStokesViscous {{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticStokesViscous {{{*/ ElementVector* Penta::CreatePVectorDiagnosticStokesViscous(void){ @@ -7514,5 +7514,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticStokesShelf{{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticStokesShelf{{{*/ ElementVector* Penta::CreatePVectorDiagnosticStokesShelf(void){ @@ -7582,5 +7582,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticVert {{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticVert {{{*/ ElementVector* Penta::CreatePVectorDiagnosticVert(void){ @@ -7596,5 +7596,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticVertVolume {{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticVertVolume {{{*/ ElementVector* Penta::CreatePVectorDiagnosticVertVolume(void){ @@ -7652,5 +7652,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorDiagnosticVertBase {{{1*/ +/*FUNCTION Penta::CreatePVectorDiagnosticVertBase {{{*/ ElementVector* Penta::CreatePVectorDiagnosticVertBase(void){ @@ -7717,5 +7717,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateJacobianDiagnosticHoriz{{{1*/ +/*FUNCTION Penta::CreateJacobianDiagnosticHoriz{{{*/ ElementMatrix* Penta::CreateJacobianDiagnosticHoriz(void){ @@ -7737,5 +7737,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateJacobianDiagnosticMacayeal2d{{{1*/ +/*FUNCTION Penta::CreateJacobianDiagnosticMacayeal2d{{{*/ ElementMatrix* Penta::CreateJacobianDiagnosticMacayeal2d(void){ @@ -7760,5 +7760,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateJacobianDiagnosticPattyn{{{1*/ +/*FUNCTION Penta::CreateJacobianDiagnosticPattyn{{{*/ ElementMatrix* Penta::CreateJacobianDiagnosticPattyn(void){ @@ -7825,5 +7825,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreateJacobianDiagnosticStokes{{{1*/ +/*FUNCTION Penta::CreateJacobianDiagnosticStokes{{{*/ ElementMatrix* Penta::CreateJacobianDiagnosticStokes(void){ @@ -7901,5 +7901,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz{{{1*/ +/*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz{{{*/ void Penta::GetSolutionFromInputsDiagnosticHoriz(Vector* solution){ @@ -7943,5 +7943,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsDiagnosticHutter{{{1*/ +/*FUNCTION Penta::GetSolutionFromInputsDiagnosticHutter{{{*/ void Penta::GetSolutionFromInputsDiagnosticHutter(Vector* solution){ @@ -7979,5 +7979,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsDiagnosticVert{{{1*/ +/*FUNCTION Penta::GetSolutionFromInputsDiagnosticVert{{{*/ void Penta::GetSolutionFromInputsDiagnosticVert(Vector* solution){ @@ -8012,5 +8012,5 @@ } /*}}}*/ -/*FUNCTION Penta::GetSolutionFromInputsDiagnosticStokes{{{1*/ +/*FUNCTION Penta::GetSolutionFromInputsDiagnosticStokes{{{*/ void Penta::GetSolutionFromInputsDiagnosticStokes(Vector* solution){ @@ -8057,5 +8057,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticHoriz {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticHoriz {{{*/ void Penta::InputUpdateFromSolutionDiagnosticHoriz(double* solution){ @@ -8093,5 +8093,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyeal {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyeal {{{*/ void Penta::InputUpdateFromSolutionDiagnosticMacAyeal(double* solution){ @@ -8174,5 +8174,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyealPattyn {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyealPattyn {{{*/ void Penta::InputUpdateFromSolutionDiagnosticMacAyealPattyn(double* solution){ @@ -8258,5 +8258,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyealStokes {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyealStokes {{{*/ void Penta::InputUpdateFromSolutionDiagnosticMacAyealStokes(double* solution){ @@ -8358,5 +8358,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticPattyn {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticPattyn {{{*/ void Penta::InputUpdateFromSolutionDiagnosticPattyn(double* solution){ @@ -8432,5 +8432,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticPattynStokes {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticPattynStokes {{{*/ void Penta::InputUpdateFromSolutionDiagnosticPattynStokes(double* solution){ @@ -8526,5 +8526,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticHutter {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticHutter {{{*/ void Penta::InputUpdateFromSolutionDiagnosticHutter(double* solution){ @@ -8589,5 +8589,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticVert {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticVert {{{*/ void Penta::InputUpdateFromSolutionDiagnosticVert(double* solution){ @@ -8693,5 +8693,5 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticStokes {{{1*/ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticStokes {{{*/ void Penta::InputUpdateFromSolutionDiagnosticStokes(double* solution){ @@ -8757,5 +8757,5 @@ #ifdef _HAVE_BALANCED_ -/*FUNCTION Penta::CreateKMatrixBalancethickness {{{1*/ +/*FUNCTION Penta::CreateKMatrixBalancethickness {{{*/ ElementMatrix* Penta::CreateKMatrixBalancethickness(void){ @@ -8782,5 +8782,5 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorBalancethickness {{{1*/ +/*FUNCTION Penta::CreatePVectorBalancethickness {{{*/ ElementVector* Penta::CreatePVectorBalancethickness(void){ Index: /issm/trunk-jpl/src/c/objects/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Penta.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Elements/Penta.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Element.h" #include "./PentaHook.h" @@ -44,10 +44,10 @@ Results *results; - /*Penta constructors and destructor: {{{1*/ + /*Penta constructors and destructor: {{{*/ Penta(); Penta(int penta_id,int penta_sid,int i, IoModel* iomodel,int nummodels); ~Penta(); /*}}}*/ - /*Object virtual functions definitions: {{{1*/ + /*Object virtual functions definitions: {{{*/ Object* copy(); void DeepEcho(); @@ -57,5 +57,5 @@ int MyRank(); /*}}}*/ - /*Update virtual functions definitions: {{{1*/ + /*Update virtual functions definitions: {{{*/ void InputUpdateFromConstant(bool constant, int name); void InputUpdateFromConstant(double constant, int name); @@ -73,5 +73,5 @@ void InputUpdateFromIoModel(int index, IoModel* iomodel); /*}}}*/ - /*Element virtual functions definitions: {{{1*/ + /*Element virtual functions definitions: {{{*/ void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,double* vertex_response,double* qmu_part); void BasalFrictionCreateInput(void); @@ -162,5 +162,5 @@ #endif /*}}}*/ - /*Penta specific routines:{{{1*/ + /*Penta specific routines:{{{*/ void BedNormal(double* bed_normal, double xyz_list[3][3]); ElementMatrix* CreateKMatrixPrognostic(void); Index: /issm/trunk-jpl/src/c/objects/Elements/PentaHook.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/PentaHook.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Elements/PentaHook.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Object constructors and destructor*/ -/*FUNCTION PentaHook::PentaHook(){{{1*/ +/*FUNCTION PentaHook::PentaHook(){{{*/ PentaHook::PentaHook(){ numanalyses=UNDEF; @@ -30,5 +30,5 @@ } /*}}}*/ -/*FUNCTION PentaHook::~PentaHook(){{{1*/ +/*FUNCTION PentaHook::~PentaHook(){{{*/ PentaHook::~PentaHook(){ @@ -44,5 +44,5 @@ } /*}}}*/ -/*FUNCTION PentaHook::PentaHook(int in_numanalyses,int matice_id, int matpar_id){{{1*/ +/*FUNCTION PentaHook::PentaHook(int in_numanalyses,int matice_id, int matpar_id){{{*/ PentaHook::PentaHook(int in_numanalyses,int matice_id, IoModel* iomodel){ @@ -67,5 +67,5 @@ /*}}}*/ -/*FUNCTION PentaHook::SetHookNodes{{{1*/ +/*FUNCTION PentaHook::SetHookNodes{{{*/ void PentaHook::SetHookNodes(int* node_ids,int analysis_counter){ this->hnodes[analysis_counter]= new Hook(node_ids,6); @@ -73,5 +73,5 @@ } /*}}}*/ -/*FUNCTION PentaHook::InitHookNeighbors{{{1*/ +/*FUNCTION PentaHook::InitHookNeighbors{{{*/ void PentaHook::InitHookNeighbors(int* element_ids){ this->hneighbors=new Hook(element_ids,2); @@ -79,5 +79,5 @@ } /*}}}*/ -/*FUNCTION PentaHook::SpawnTriaHook{{{1*/ +/*FUNCTION PentaHook::SpawnTriaHook{{{*/ void PentaHook::SpawnTriaHook(TriaHook* triahook,int* indices){ Index: /issm/trunk-jpl/src/c/objects/Elements/PentaHook.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/PentaHook.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Elements/PentaHook.h (revision 12365) @@ -19,5 +19,5 @@ Hook* hneighbors; // 2 elements, first down, second up - /*FUNCTION constructors, destructors {{{1*/ + /*FUNCTION constructors, destructors {{{*/ PentaHook(); PentaHook(int in_numanalyses,int matice_id, IoModel* iomodel); Index: /issm/trunk-jpl/src/c/objects/Elements/PentaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/PentaRef.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Elements/PentaRef.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -26,10 +26,10 @@ /*Object constructors and destructor*/ -/*FUNCTION PentaRef::PentaRef(){{{1*/ +/*FUNCTION PentaRef::PentaRef(){{{*/ PentaRef::PentaRef(){ this->element_type_list=NULL; } /*}}}*/ -/*FUNCTION PentaRef::PentaRef(int* types,int nummodels){{{1*/ +/*FUNCTION PentaRef::PentaRef(int* types,int nummodels){{{*/ PentaRef::PentaRef(const int nummodels){ @@ -39,5 +39,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::~PentaRef(){{{1*/ +/*FUNCTION PentaRef::~PentaRef(){{{*/ PentaRef::~PentaRef(){ xfree((void**)&element_type_list); @@ -46,5 +46,5 @@ /*Management*/ -/*FUNCTION PentaRef::SetElementType{{{1*/ +/*FUNCTION PentaRef::SetElementType{{{*/ void PentaRef::SetElementType(int type,int type_counter){ @@ -57,5 +57,5 @@ /*Reference Element numerics*/ -/*FUNCTION PentaRef::GetBMacAyealPattyn {{{1*/ +/*FUNCTION PentaRef::GetBMacAyealPattyn {{{*/ void PentaRef::GetBMacAyealPattyn(double* B, double* xyz_list, GaussPenta* gauss){ /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2. @@ -88,5 +88,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBMacAyealStokes{{{1*/ +/*FUNCTION PentaRef::GetBMacAyealStokes{{{*/ void PentaRef::GetBMacAyealStokes(double* B, double* xyz_list, GaussPenta* gauss){ /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2. @@ -134,5 +134,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBPattyn {{{1*/ +/*FUNCTION PentaRef::GetBPattyn {{{*/ void PentaRef::GetBPattyn(double* B, double* xyz_list, GaussPenta* gauss){ /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2. @@ -174,5 +174,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBprimePattyn {{{1*/ +/*FUNCTION PentaRef::GetBprimePattyn {{{*/ void PentaRef::GetBprimePattyn(double* B, double* xyz_list, GaussPenta* gauss_coord){ /*Compute B prime matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2. @@ -212,5 +212,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBprimeMacAyealStokes{{{1*/ +/*FUNCTION PentaRef::GetBprimeMacAyealStokes{{{*/ void PentaRef::GetBprimeMacAyealStokes(double* Bprime, double* xyz_list, GaussPenta* gauss){ /*Compute Bprime matrix. Bprime=[Bprime1 Bprime2 Bprime3 Bprime4 Bprime5 Bprime6] where Bprimei is of size 5*NDOF2. @@ -252,5 +252,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBStokes {{{1*/ +/*FUNCTION PentaRef::GetBStokes {{{*/ void PentaRef::GetBStokes(double* B, double* xyz_list, GaussPenta* gauss){ @@ -319,5 +319,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBprimeStokes {{{1*/ +/*FUNCTION PentaRef::GetBprimeStokes {{{*/ void PentaRef::GetBprimeStokes(double* B_prime, double* xyz_list, GaussPenta* gauss){ /* Compute B' matrix. B'=[B1' B2' B3' B4' B5' B6' Bb'] where Bi' is of size 3*NDOF2. @@ -386,5 +386,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBAdvec{{{1*/ +/*FUNCTION PentaRef::GetBAdvec{{{*/ void PentaRef::GetBAdvec(double* B_advec, double* xyz_list, GaussPenta* gauss){ /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1. @@ -413,5 +413,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBConduct{{{1*/ +/*FUNCTION PentaRef::GetBConduct{{{*/ void PentaRef::GetBConduct(double* B_conduct, double* xyz_list, GaussPenta* gauss){ /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1. @@ -440,5 +440,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBVert{{{1*/ +/*FUNCTION PentaRef::GetBVert{{{*/ void PentaRef::GetBVert(double* B, double* xyz_list, GaussPenta* gauss){ /* Compute B matrix. B=[dh1/dz dh2/dz dh3/dz dh4/dz dh5/dz dh6/dz]; @@ -458,5 +458,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBprimeAdvec{{{1*/ +/*FUNCTION PentaRef::GetBprimeAdvec{{{*/ void PentaRef::GetBprimeAdvec(double* Bprime_advec, double* xyz_list, GaussPenta* gauss){ /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF1. @@ -485,5 +485,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBprimeVert{{{1*/ +/*FUNCTION PentaRef::GetBprimeVert{{{*/ void PentaRef::GetBprimeVert(double* B, double* xyz_list, GaussPenta* gauss){ /* Compute Bprime matrix. Bprime=[L1 L2 L3 L4 L5 L6] where Li is the nodal function for node i*/ @@ -493,5 +493,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetL{{{1*/ +/*FUNCTION PentaRef::GetL{{{*/ void PentaRef::GetL(double* L, GaussPenta* gauss, int numdof){ /*Compute L matrix. L=[L1 L2 L3] where Li is square and of size numdof. @@ -530,5 +530,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetLStokes{{{1*/ +/*FUNCTION PentaRef::GetLStokes{{{*/ void PentaRef::GetLStokes(double* LStokes, GaussPenta* gauss){ /* @@ -565,5 +565,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetLprimeStokes {{{1*/ +/*FUNCTION PentaRef::GetLprimeStokes {{{*/ void PentaRef::GetLprimeStokes(double* LprimeStokes, double* xyz_list, GaussPenta* gauss){ @@ -677,5 +677,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetLMacAyealStokes {{{1*/ +/*FUNCTION PentaRef::GetLMacAyealStokes {{{*/ void PentaRef::GetLMacAyealStokes(double* LStokes, GaussPenta* gauss){ /* @@ -727,5 +727,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetLprimeMacAyealStokes {{{1*/ +/*FUNCTION PentaRef::GetLprimeMacAyealStokes {{{*/ void PentaRef::GetLprimeMacAyealStokes(double* LprimeStokes, double* xyz_list, GaussPenta* gauss){ @@ -794,5 +794,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetLStokesMacAyeal {{{1*/ +/*FUNCTION PentaRef::GetLStokesMacAyeal {{{*/ void PentaRef::GetLStokesMacAyeal(double* LStokes, GaussPenta* gauss){ /* @@ -840,5 +840,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetLprimeStokesMacAyeal {{{1*/ +/*FUNCTION PentaRef::GetLprimeStokesMacAyeal {{{*/ void PentaRef::GetLprimeStokesMacAyeal(double* LprimeStokes, double* xyz_list, GaussPenta* gauss){ @@ -879,5 +879,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetJacobian {{{1*/ +/*FUNCTION PentaRef::GetJacobian {{{*/ void PentaRef::GetJacobian(double* J, double* xyz_list,GaussPenta* gauss){ @@ -938,5 +938,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetJacobianDeterminant {{{1*/ +/*FUNCTION PentaRef::GetJacobianDeterminant {{{*/ void PentaRef::GetJacobianDeterminant(double* Jdet, double* xyz_list,GaussPenta* gauss){ /*On a penta, Jacobian varies according to coordinates. We need to get the Jacobian, and take @@ -953,5 +953,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetTriaJacobianDeterminant{{{1*/ +/*FUNCTION PentaRef::GetTriaJacobianDeterminant{{{*/ void PentaRef::GetTriaJacobianDeterminant(double* Jdet, double* xyz_list,GaussPenta* gauss){ /*The Jacobian determinant is constant over the element, discard the gaussian points. @@ -975,5 +975,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetSegmentJacobianDeterminant{{{1*/ +/*FUNCTION PentaRef::GetSegmentJacobianDeterminant{{{*/ void PentaRef::GetSegmentJacobianDeterminant(double* Jdet, double* xyz_list,GaussPenta* gauss){ /*The Jacobian determinant is constant over the element, discard the gaussian points. @@ -994,5 +994,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetJacobianInvert {{{1*/ +/*FUNCTION PentaRef::GetJacobianInvert {{{*/ void PentaRef::GetJacobianInvert(double* Jinv, double* xyz_list,GaussPenta* gauss){ @@ -1007,5 +1007,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetNodalFunctionsMINI{{{1*/ +/*FUNCTION PentaRef::GetNodalFunctionsMINI{{{*/ void PentaRef::GetNodalFunctionsMINI(double* l1l7, GaussPenta* gauss){ /*This routine returns the values of the nodal functions at the gaussian point.*/ @@ -1021,5 +1021,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetNodalFunctionsMINIDerivatives{{{1*/ +/*FUNCTION PentaRef::GetNodalFunctionsMINIDerivatives{{{*/ void PentaRef::GetNodalFunctionsMINIDerivatives(double* dh1dh7,double* xyz_list, GaussPenta* gauss){ @@ -1052,5 +1052,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetNodalFunctionsMINIDerivativesReference{{{1*/ +/*FUNCTION PentaRef::GetNodalFunctionsMINIDerivativesReference{{{*/ void PentaRef::GetNodalFunctionsMINIDerivativesReference(double* dl1dl7,GaussPenta* gauss){ @@ -1098,5 +1098,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetNodalFunctionsP1 {{{1*/ +/*FUNCTION PentaRef::GetNodalFunctionsP1 {{{*/ void PentaRef::GetNodalFunctionsP1(double* l1l6, GaussPenta* gauss){ /*This routine returns the values of the nodal functions at the gaussian point.*/ @@ -1111,5 +1111,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetNodalFunctionsP1Derivatives {{{1*/ +/*FUNCTION PentaRef::GetNodalFunctionsP1Derivatives {{{*/ void PentaRef::GetNodalFunctionsP1Derivatives(double* dh1dh6,double* xyz_list, GaussPenta* gauss){ @@ -1140,5 +1140,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetNodalFunctionsP1DerivativesReference {{{1*/ +/*FUNCTION PentaRef::GetNodalFunctionsP1DerivativesReference {{{*/ void PentaRef::GetNodalFunctionsP1DerivativesReference(double* dl1dl6,GaussPenta* gauss){ @@ -1184,5 +1184,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetQuadNodalFunctions {{{1*/ +/*FUNCTION PentaRef::GetQuadNodalFunctions {{{*/ void PentaRef::GetQuadNodalFunctions(double* l1l4,GaussPenta* gauss,int index1,int index2,int index3,int index4){ /*This routine returns the values of the nodal functions at the gaussian point.*/ @@ -1204,5 +1204,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetQuadJacobianDeterminant{{{1*/ +/*FUNCTION PentaRef::GetQuadJacobianDeterminant{{{*/ void PentaRef::GetQuadJacobianDeterminant(double* Jdet,double xyz_list[4][3],GaussPenta* gauss){ /*This routine returns the values of the nodal functions at the gaussian point.*/ @@ -1230,5 +1230,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetInputValue{{{1*/ +/*FUNCTION PentaRef::GetInputValue{{{*/ void PentaRef::GetInputValue(double* pvalue,double* plist,GaussPenta* gauss){ /*P1 interpolation on Gauss point*/ @@ -1245,5 +1245,5 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetInputDerivativeValue{{{1*/ +/*FUNCTION PentaRef::GetInputDerivativeValue{{{*/ void PentaRef::GetInputDerivativeValue(double* p, double* plist,double* xyz_list, GaussPenta* gauss){ /*From node values of parameter p (p_list[0], p_list[1], p_list[2], p_list[3], p_list[4] and p_list[4]), return parameter derivative value at gaussian point specified by gauss_coord: Index: /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -23,5 +23,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION Tria::Tria(){{{1*/ +/*FUNCTION Tria::Tria(){{{*/ Tria::Tria(){ @@ -38,5 +38,5 @@ } /*}}}*/ -/*FUNCTION Tria::Tria(int id, int sid,int index, IoModel* iomodel,int nummodels){{{1*/ +/*FUNCTION Tria::Tria(int id, int sid,int index, IoModel* iomodel,int nummodels){{{*/ Tria::Tria(int tria_id, int tria_sid, int index, IoModel* iomodel,int nummodels) :TriaRef(nummodels) @@ -66,5 +66,5 @@ } /*}}}*/ -/*FUNCTION Tria::~Tria(){{{1*/ +/*FUNCTION Tria::~Tria(){{{*/ Tria::~Tria(){ delete inputs; @@ -73,5 +73,5 @@ } /*}}}*/ -/*FUNCTION Tria::copy {{{1*/ +/*FUNCTION Tria::copy {{{*/ Object* Tria::copy() { @@ -124,5 +124,5 @@ /*Other*/ -/*FUNCTION Tria::AverageOntoPartition {{{1*/ +/*FUNCTION Tria::AverageOntoPartition {{{*/ void Tria::AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,double* vertex_response,double* qmu_part){ @@ -164,5 +164,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrix {{{1*/ +/*FUNCTION Tria::CreateKMatrix {{{*/ void Tria::CreateKMatrix(Matrix* Kff, Matrix* Kfs,Vector* df){ @@ -172,5 +172,5 @@ parameters->FindParam(&analysis_type,AnalysisTypeEnum); - /*Checks in debugging mode{{{2*/ + /*Checks in debugging mode{{{*/ _assert_(this->nodes && this->matice && this->matpar && this->parameters && this->inputs); /*}}}*/ @@ -224,5 +224,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixMelting {{{1*/ +/*FUNCTION Tria::CreateKMatrixMelting {{{*/ ElementMatrix* Tria::CreateKMatrixMelting(void){ @@ -268,5 +268,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixPrognostic {{{1*/ +/*FUNCTION Tria::CreateKMatrixPrognostic {{{*/ ElementMatrix* Tria::CreateKMatrixPrognostic(void){ @@ -282,5 +282,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixPrognostic_CG {{{1*/ +/*FUNCTION Tria::CreateKMatrixPrognostic_CG {{{*/ ElementMatrix* Tria::CreateKMatrixPrognostic_CG(void){ @@ -402,5 +402,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixPrognostic_DG {{{1*/ +/*FUNCTION Tria::CreateKMatrixPrognostic_DG {{{*/ ElementMatrix* Tria::CreateKMatrixPrognostic_DG(void){ @@ -477,5 +477,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixSlope {{{1*/ +/*FUNCTION Tria::CreateKMatrixSlope {{{*/ ElementMatrix* Tria::CreateKMatrixSlope(void){ @@ -517,5 +517,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVector {{{1*/ +/*FUNCTION Tria::CreatePVector {{{*/ void Tria::CreatePVector(Vector* pf){ @@ -578,5 +578,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorPrognostic{{{1*/ +/*FUNCTION Tria::CreatePVectorPrognostic{{{*/ ElementVector* Tria::CreatePVectorPrognostic(void){ @@ -591,5 +591,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorPrognostic_CG {{{1*/ +/*FUNCTION Tria::CreatePVectorPrognostic_CG {{{*/ ElementVector* Tria::CreatePVectorPrognostic_CG(void){ @@ -642,5 +642,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorPrognostic_DG {{{1*/ +/*FUNCTION Tria::CreatePVectorPrognostic_DG {{{*/ ElementVector* Tria::CreatePVectorPrognostic_DG(void){ @@ -687,5 +687,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorSlope {{{1*/ +/*FUNCTION Tria::CreatePVectorSlope {{{*/ ElementVector* Tria::CreatePVectorSlope(void){ @@ -740,5 +740,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateJacobianMatrix{{{1*/ +/*FUNCTION Tria::CreateJacobianMatrix{{{*/ void Tria::CreateJacobianMatrix(Matrix* Jff){ @@ -748,5 +748,5 @@ parameters->FindParam(&analysis_type,AnalysisTypeEnum); - /*Checks in debugging {{{2*/ + /*Checks in debugging {{{*/ _assert_(this->nodes && this->matice && this->matpar && this->parameters && this->inputs); /*}}}*/ @@ -773,15 +773,15 @@ } /*}}}*/ -/*FUNCTION Tria::ComputeBasalStress {{{1*/ +/*FUNCTION Tria::ComputeBasalStress {{{*/ void Tria::ComputeBasalStress(Vector* eps){ _error_("Not Implemented yet"); } /*}}}*/ -/*FUNCTION Tria::ComputeStrainRate {{{1*/ +/*FUNCTION Tria::ComputeStrainRate {{{*/ void Tria::ComputeStrainRate(Vector* eps){ _error_("Not Implemented yet"); } /*}}}*/ -/*FUNCTION Tria::ComputeStressTensor {{{1*/ +/*FUNCTION Tria::ComputeStressTensor {{{*/ void Tria::ComputeStressTensor(){ @@ -834,5 +834,5 @@ } /*}}}*/ -/*FUNCTION Tria::Configure {{{1*/ +/*FUNCTION Tria::Configure {{{*/ void Tria::Configure(Elements* elementsin, Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){ @@ -864,5 +864,5 @@ } /*}}}*/ -/*FUNCTION Tria::DeepEcho{{{1*/ +/*FUNCTION Tria::DeepEcho{{{*/ void Tria::DeepEcho(void){ @@ -899,5 +899,5 @@ } /*}}}*/ -/*FUNCTION Tria::DeleteResults {{{1*/ +/*FUNCTION Tria::DeleteResults {{{*/ void Tria::DeleteResults(void){ @@ -908,5 +908,5 @@ } /*}}}*/ -/*FUNCTION Tria::Echo{{{1*/ +/*FUNCTION Tria::Echo{{{*/ void Tria::Echo(void){ printf("Tria:\n"); @@ -940,5 +940,5 @@ } /*}}}*/ -/*FUNCTION Tria::ObjectEnum{{{1*/ +/*FUNCTION Tria::ObjectEnum{{{*/ int Tria::ObjectEnum(void){ @@ -947,5 +947,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetArea {{{1*/ +/*FUNCTION Tria::GetArea {{{*/ double Tria::GetArea(void){ @@ -964,5 +964,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetDofList {{{1*/ +/*FUNCTION Tria::GetDofList {{{*/ void Tria::GetDofList(int** pdoflist, int approximation_enum,int setenum){ @@ -987,5 +987,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetDofList1 {{{1*/ +/*FUNCTION Tria::GetDofList1 {{{*/ void Tria::GetDofList1(int* doflist){ @@ -995,5 +995,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetElementType {{{1*/ +/*FUNCTION Tria::GetElementType {{{*/ int Tria::GetElementType(){ @@ -1003,5 +1003,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetHorizontalNeighboorSids {{{1*/ +/*FUNCTION Tria::GetHorizontalNeighboorSids {{{*/ int* Tria::GetHorizontalNeighboorSids(){ @@ -1011,5 +1011,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetNodeIndex {{{1*/ +/*FUNCTION Tria::GetNodeIndex {{{*/ int Tria::GetNodeIndex(Node* node){ @@ -1022,5 +1022,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype) {{{1*/ +/*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype) {{{*/ void Tria::GetInputListOnVertices(double* pvalue,int enumtype){ @@ -1047,5 +1047,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{1*/ +/*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue) {{{*/ void Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue){ @@ -1073,5 +1073,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index) TO BE REMOVED{{{1*/ +/*FUNCTION Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index) TO BE REMOVED{{{*/ void Tria::GetInputListOnVertices(double* pvalue,int enumtype,double defaultvalue,int index){ @@ -1099,5 +1099,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetInputValue(double* pvalue,Node* node,int enumtype) {{{1*/ +/*FUNCTION Tria::GetInputValue(double* pvalue,Node* node,int enumtype) {{{*/ void Tria::GetInputValue(double* pvalue,Node* node,int enumtype){ @@ -1112,15 +1112,15 @@ } /*}}}*/ -/*FUNCTION Tria::GetSidList {{{1*/ +/*FUNCTION Tria::GetSidList {{{*/ void Tria::GetSidList(int* sidlist){ for(int i=0;iGetSidList(); } /*}}}*/ -/*FUNCTION Tria::GetConnectivityList {{{1*/ +/*FUNCTION Tria::GetConnectivityList {{{*/ void Tria::GetConnectivityList(int* connectivity){ for(int i=0;iGetConnectivity(); } /*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputs{{{1*/ +/*FUNCTION Tria::GetSolutionFromInputs{{{*/ void Tria::GetSolutionFromInputs(Vector* solution){ @@ -1150,5 +1150,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){{{1*/ +/*FUNCTION Tria::GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){{{*/ void Tria::GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){ /*Compute the 2d Strain Rate (3 components): @@ -1172,5 +1172,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetVectorFromInputs{{{1*/ +/*FUNCTION Tria::GetVectorFromInputs{{{*/ void Tria::GetVectorFromInputs(Vector* vector,int input_enum){ @@ -1191,5 +1191,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetVectorFromResults{{{1*/ +/*FUNCTION Tria::GetVectorFromResults{{{*/ void Tria::GetVectorFromResults(Vector* vector,int offset,int interp){ @@ -1211,5 +1211,5 @@ } /*}}}*/ -/*FUNCTION Tria::Id {{{1*/ +/*FUNCTION Tria::Id {{{*/ int Tria::Id(){ @@ -1218,5 +1218,5 @@ } /*}}}*/ -/*FUNCTION Tria::Sid {{{1*/ +/*FUNCTION Tria::Sid {{{*/ int Tria::Sid(){ @@ -1225,5 +1225,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputArtificialNoise{{{1*/ +/*FUNCTION Tria::InputArtificialNoise{{{*/ void Tria::InputArtificialNoise(int enum_type,double min,double max){ @@ -1238,5 +1238,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputConvergence{{{1*/ +/*FUNCTION Tria::InputConvergence{{{*/ bool Tria::InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums){ @@ -1268,5 +1268,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputDepthAverageAtBase {{{1*/ +/*FUNCTION Tria::InputDepthAverageAtBase {{{*/ void Tria::InputDepthAverageAtBase(int enum_type,int average_enum_type,int object_enum){ @@ -1297,5 +1297,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputDuplicate{{{1*/ +/*FUNCTION Tria::InputDuplicate{{{*/ void Tria::InputDuplicate(int original_enum,int new_enum){ @@ -1305,5 +1305,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputScale{{{1*/ +/*FUNCTION Tria::InputScale{{{*/ void Tria::InputScale(int enum_type,double scale_factor){ @@ -1318,5 +1318,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputToResult{{{1*/ +/*FUNCTION Tria::InputToResult{{{*/ void Tria::InputToResult(int enum_type,int step,double time){ @@ -1341,5 +1341,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromConstant(int value, int name);{{{1*/ +/*FUNCTION Tria::InputUpdateFromConstant(int value, int name);{{{*/ void Tria::InputUpdateFromConstant(int constant, int name){ /*Check that name is an element input*/ @@ -1350,5 +1350,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromConstant(double value, int name);{{{1*/ +/*FUNCTION Tria::InputUpdateFromConstant(double value, int name);{{{*/ void Tria::InputUpdateFromConstant(double constant, int name){ /*Check that name is an element input*/ @@ -1359,5 +1359,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromConstant(bool value, int name);{{{1*/ +/*FUNCTION Tria::InputUpdateFromConstant(bool value, int name);{{{*/ void Tria::InputUpdateFromConstant(bool constant, int name){ /*Check that name is an element input*/ @@ -1368,5 +1368,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromIoModel{{{1*/ +/*FUNCTION Tria::InputUpdateFromIoModel{{{*/ void Tria::InputUpdateFromIoModel(int index, IoModel* iomodel){ //i is the element index @@ -1454,5 +1454,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolution {{{1*/ +/*FUNCTION Tria::InputUpdateFromSolution {{{*/ void Tria::InputUpdateFromSolution(double* solution){ @@ -1509,5 +1509,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionOneDof{{{1*/ +/*FUNCTION Tria::InputUpdateFromSolutionOneDof{{{*/ void Tria::InputUpdateFromSolutionOneDof(double* solution,int enum_type){ @@ -1533,5 +1533,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionPrognostic{{{1*/ +/*FUNCTION Tria::InputUpdateFromSolutionPrognostic{{{*/ void Tria::InputUpdateFromSolutionPrognostic(double* solution){ @@ -1600,5 +1600,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromVector(double* vector, int name, int type);{{{1*/ +/*FUNCTION Tria::InputUpdateFromVector(double* vector, int name, int type);{{{*/ void Tria::InputUpdateFromVector(double* vector, int name, int type){ @@ -1632,15 +1632,15 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromVector(int* vector, int name, int type);{{{1*/ +/*FUNCTION Tria::InputUpdateFromVector(int* vector, int name, int type);{{{*/ void Tria::InputUpdateFromVector(int* vector, int name, int type){ _error_(" not supported yet!"); } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromVector(bool* vector, int name, int type);{{{1*/ +/*FUNCTION Tria::InputUpdateFromVector(bool* vector, int name, int type);{{{*/ void Tria::InputUpdateFromVector(bool* vector, int name, int type){ _error_(" not supported yet!"); } /*}}}*/ -/*FUNCTION Tria::InputCreate(double scalar,int enum,int code);{{{1*/ +/*FUNCTION Tria::InputCreate(double scalar,int enum,int code);{{{*/ void Tria::InputCreate(double scalar,int name,int code){ @@ -1661,5 +1661,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputCreate(double* vector,int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){{{1*/ +/*FUNCTION Tria::InputCreate(double* vector,int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){{{*/ void Tria::InputCreate(double* vector, int index,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code){//index into elements @@ -1751,5 +1751,5 @@ } /*}}}*/ -/*FUNCTION Tria::IsInput{{{1*/ +/*FUNCTION Tria::IsInput{{{*/ bool Tria::IsInput(int name){ if ( @@ -1785,5 +1785,5 @@ } /*}}}*/ -/*FUNCTION Tria::IsOnBed {{{1*/ +/*FUNCTION Tria::IsOnBed {{{*/ bool Tria::IsOnBed(){ @@ -1793,5 +1793,5 @@ } /*}}}*/ -/*FUNCTION Tria::IsFloating {{{1*/ +/*FUNCTION Tria::IsFloating {{{*/ bool Tria::IsFloating(){ @@ -1801,5 +1801,5 @@ } /*}}}*/ -/*FUNCTION Tria::IsNodeOnShelf {{{1*/ +/*FUNCTION Tria::IsNodeOnShelf {{{*/ bool Tria::IsNodeOnShelf(){ @@ -1816,5 +1816,5 @@ } /*}}}*/ -/*FUNCTION Tria::IsNodeOnShelfFromFlags {{{1*/ +/*FUNCTION Tria::IsNodeOnShelfFromFlags {{{*/ bool Tria::IsNodeOnShelfFromFlags(double* flags){ @@ -1831,5 +1831,5 @@ } /*}}}*/ -/*FUNCTION Tria::IsOnWater {{{1*/ +/*FUNCTION Tria::IsOnWater {{{*/ bool Tria::IsOnWater(){ @@ -1890,5 +1890,5 @@ }/*}}}*/ -/*FUNCTION Tria::MigrateGroundingLine{{{1*/ +/*FUNCTION Tria::MigrateGroundingLine{{{*/ void Tria::MigrateGroundingLine(double* old_floating_ice,double* sheet_ungrounding){ @@ -1966,5 +1966,5 @@ } /*}}}*/ -/*FUNCTION Tria::MyRank {{{1*/ +/*FUNCTION Tria::MyRank {{{*/ int Tria::MyRank(void){ extern int my_rank; @@ -1972,5 +1972,5 @@ } /*}}}*/ -/*FUNCTION Tria::NodalValue {{{1*/ +/*FUNCTION Tria::NodalValue {{{*/ int Tria::NodalValue(double* pvalue, int index, int natureofdataenum,bool process_units){ @@ -2003,5 +2003,5 @@ } /*}}}*/ -/*FUNCTION Tria::PatchFill{{{1*/ +/*FUNCTION Tria::PatchFill{{{*/ void Tria::PatchFill(int* prow, Patch* patch){ @@ -2030,5 +2030,5 @@ } /*}}}*/ -/*FUNCTION Tria::PatchSize{{{1*/ +/*FUNCTION Tria::PatchSize{{{*/ void Tria::PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes){ @@ -2054,5 +2054,5 @@ } /*}}}*/ -/*FUNCTION Tria::PotentialSheetUngrounding{{{1*/ +/*FUNCTION Tria::PotentialSheetUngrounding{{{*/ void Tria::PotentialSheetUngrounding(Vector* potential_sheet_ungrounding){ @@ -2083,5 +2083,5 @@ } /*}}}*/ -/*FUNCTION Tria::PositiveDegreeDay{{{1*/ +/*FUNCTION Tria::PositiveDegreeDay{{{*/ void Tria::PositiveDegreeDay(double* pdds,double* pds,double signorm){ @@ -2318,5 +2318,5 @@ } /*}}}*/ -/*FUNCTION Tria::ProcessResultsUnits{{{1*/ +/*FUNCTION Tria::ProcessResultsUnits{{{*/ void Tria::ProcessResultsUnits(void){ @@ -2329,5 +2329,5 @@ } /*}}}*/ -/*FUNCTION Tria::RequestedOutput{{{1*/ +/*FUNCTION Tria::RequestedOutput{{{*/ void Tria::RequestedOutput(int output_enum,int step,double time){ @@ -2357,17 +2357,17 @@ } /*}}}*/ -/*FUNCTION Tria::SetClone {{{1*/ +/*FUNCTION Tria::SetClone {{{*/ void Tria::SetClone(int* minranks){ _error_("not implemented yet"); } -/*}}}1*/ -/*FUNCTION Tria::SmearFunction {{{1*/ +/*}}}*/ +/*FUNCTION Tria::SmearFunction {{{*/ void Tria::SmearFunction(Vector* smearedvector,double (*WeightFunction)(double distance,double radius),double radius){ _error_("not implemented yet"); } -/*}}}1*/ -/*FUNCTION Tria::SetCurrentConfiguration {{{1*/ +/*}}}*/ +/*FUNCTION Tria::SetCurrentConfiguration {{{*/ void Tria::SetCurrentConfiguration(Elements* elementsin, Loads* loadsin, DataSet* nodesin, Materials* materialsin, Parameters* parametersin){ @@ -2385,5 +2385,5 @@ } /*}}}*/ -/*FUNCTION Tria::SurfaceArea {{{1*/ +/*FUNCTION Tria::SurfaceArea {{{*/ double Tria::SurfaceArea(void){ @@ -2414,5 +2414,5 @@ } /*}}}*/ -/*FUNCTION Tria::SurfaceNormal{{{1*/ +/*FUNCTION Tria::SurfaceNormal{{{*/ void Tria::SurfaceNormal(double* surface_normal, double xyz_list[3][3]){ @@ -2438,5 +2438,5 @@ } /*}}}*/ -/*FUNCTION Tria::TimeAdapt{{{1*/ +/*FUNCTION Tria::TimeAdapt{{{*/ double Tria::TimeAdapt(void){ @@ -2484,5 +2484,5 @@ } /*}}}*/ -/*FUNCTION Tria::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){{{1*/ +/*FUNCTION Tria::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){{{*/ void Tria::Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type){ //i is the element index @@ -2498,5 +2498,5 @@ /*Checks if debuging*/ - /*{{{2*/ + /*{{{*/ _assert_(iomodel->Data(MeshElementsEnum)); /*}}}*/ @@ -2584,5 +2584,5 @@ } /*}}}*/ -/*FUNCTION Tria::UpdatePotentialSheetUngrounding{{{1*/ +/*FUNCTION Tria::UpdatePotentialSheetUngrounding{{{*/ int Tria::UpdatePotentialSheetUngrounding(double* vertices_potentially_ungrounding,Vector* vec_nodes_on_iceshelf,double* nodes_on_iceshelf){ @@ -2606,5 +2606,5 @@ #ifdef _HAVE_RESPONSES_ -/*FUNCTION Tria::IceVolume {{{1*/ +/*FUNCTION Tria::IceVolume {{{*/ double Tria::IceVolume(void){ @@ -2632,5 +2632,5 @@ } /*}}}*/ -/*FUNCTION Tria::MassFlux {{{1*/ +/*FUNCTION Tria::MassFlux {{{*/ double Tria::MassFlux( double* segment,bool process_units){ @@ -2704,5 +2704,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxAbsVx{{{1*/ +/*FUNCTION Tria::MaxAbsVx{{{*/ void Tria::MaxAbsVx(double* pmaxabsvx, bool process_units){ @@ -2717,5 +2717,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxAbsVy{{{1*/ +/*FUNCTION Tria::MaxAbsVy{{{*/ void Tria::MaxAbsVy(double* pmaxabsvy, bool process_units){ @@ -2730,5 +2730,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxAbsVz{{{1*/ +/*FUNCTION Tria::MaxAbsVz{{{*/ void Tria::MaxAbsVz(double* pmaxabsvz, bool process_units){ @@ -2743,5 +2743,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxVel{{{1*/ +/*FUNCTION Tria::MaxVel{{{*/ void Tria::MaxVel(double* pmaxvel, bool process_units){ @@ -2756,5 +2756,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxVx{{{1*/ +/*FUNCTION Tria::MaxVx{{{*/ void Tria::MaxVx(double* pmaxvx, bool process_units){ @@ -2769,5 +2769,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxVy{{{1*/ +/*FUNCTION Tria::MaxVy{{{*/ void Tria::MaxVy(double* pmaxvy, bool process_units){ @@ -2783,5 +2783,5 @@ } /*}}}*/ -/*FUNCTION Tria::MaxVz{{{1*/ +/*FUNCTION Tria::MaxVz{{{*/ void Tria::MaxVz(double* pmaxvz, bool process_units){ @@ -2796,5 +2796,5 @@ } /*}}}*/ -/*FUNCTION Tria::MinVel{{{1*/ +/*FUNCTION Tria::MinVel{{{*/ void Tria::MinVel(double* pminvel, bool process_units){ @@ -2809,5 +2809,5 @@ } /*}}}*/ -/*FUNCTION Tria::MinVx{{{1*/ +/*FUNCTION Tria::MinVx{{{*/ void Tria::MinVx(double* pminvx, bool process_units){ @@ -2822,5 +2822,5 @@ } /*}}}*/ -/*FUNCTION Tria::MinVy{{{1*/ +/*FUNCTION Tria::MinVy{{{*/ void Tria::MinVy(double* pminvy, bool process_units){ @@ -2835,5 +2835,5 @@ } /*}}}*/ -/*FUNCTION Tria::MinVz{{{1*/ +/*FUNCTION Tria::MinVz{{{*/ void Tria::MinVz(double* pminvz, bool process_units){ @@ -2848,5 +2848,5 @@ } /*}}}*/ -/*FUNCTION Tria::ElementResponse{{{1*/ +/*FUNCTION Tria::ElementResponse{{{*/ void Tria::ElementResponse(double* presponse,int response_enum,bool process_units){ @@ -2878,5 +2878,5 @@ #ifdef _HAVE_DIAGNOSTIC_ -/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyeal {{{1*/ +/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyeal {{{*/ ElementMatrix* Tria::CreateKMatrixDiagnosticMacAyeal(void){ @@ -2892,5 +2892,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyealViscous{{{1*/ +/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyealViscous{{{*/ ElementMatrix* Tria::CreateKMatrixDiagnosticMacAyealViscous(void){ @@ -2956,5 +2956,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyealFriction {{{1*/ +/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyealFriction {{{*/ ElementMatrix* Tria::CreateKMatrixDiagnosticMacAyealFriction(void){ @@ -3025,5 +3025,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixDiagnosticHutter{{{1*/ +/*FUNCTION Tria::CreateKMatrixDiagnosticHutter{{{*/ ElementMatrix* Tria::CreateKMatrixDiagnosticHutter(void){ @@ -3046,5 +3046,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorDiagnosticMacAyeal {{{1*/ +/*FUNCTION Tria::CreatePVectorDiagnosticMacAyeal {{{*/ ElementVector* Tria::CreatePVectorDiagnosticMacAyeal(){ @@ -3100,5 +3100,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorDiagnosticHutter{{{1*/ +/*FUNCTION Tria::CreatePVectorDiagnosticHutter{{{*/ ElementVector* Tria::CreatePVectorDiagnosticHutter(void){ @@ -3150,5 +3150,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateJacobianDiagnosticMacayeal{{{1*/ +/*FUNCTION Tria::CreateJacobianDiagnosticMacayeal{{{*/ ElementMatrix* Tria::CreateJacobianDiagnosticMacayeal(void){ @@ -3216,5 +3216,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz{{{1*/ +/*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz{{{*/ void Tria::GetSolutionFromInputsDiagnosticHoriz(Vector* solution){ @@ -3255,5 +3255,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputsDiagnosticHutter{{{1*/ +/*FUNCTION Tria::GetSolutionFromInputsDiagnosticHutter{{{*/ void Tria::GetSolutionFromInputsDiagnosticHutter(Vector* solution){ @@ -3294,5 +3294,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHoriz {{{1*/ +/*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHoriz {{{*/ void Tria::InputUpdateFromSolutionDiagnosticHoriz(double* solution){ @@ -3357,5 +3357,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHutter {{{1*/ +/*FUNCTION Tria::InputUpdateFromSolutionDiagnosticHutter {{{*/ void Tria::InputUpdateFromSolutionDiagnosticHutter(double* solution){ @@ -3419,5 +3419,5 @@ #ifdef _HAVE_CONTROL_ -/*FUNCTION Tria::InputControlUpdate{{{1*/ +/*FUNCTION Tria::InputControlUpdate{{{*/ void Tria::InputControlUpdate(double scalar,bool save_parameter){ @@ -3454,5 +3454,5 @@ } /*}}}*/ -/*FUNCTION Tria::ControlInputGetGradient{{{1*/ +/*FUNCTION Tria::ControlInputGetGradient{{{*/ void Tria::ControlInputGetGradient(Vector* gradient,int enum_type,int control_index){ @@ -3473,5 +3473,5 @@ }/*}}}*/ -/*FUNCTION Tria::ControlInputScaleGradient{{{1*/ +/*FUNCTION Tria::ControlInputScaleGradient{{{*/ void Tria::ControlInputScaleGradient(int enum_type,double scale){ @@ -3489,5 +3489,5 @@ ((ControlInput*)input)->ScaleGradient(scale); }/*}}}*/ -/*FUNCTION Tria::ControlInputSetGradient{{{1*/ +/*FUNCTION Tria::ControlInputSetGradient{{{*/ void Tria::ControlInputSetGradient(double* gradient,int enum_type,int control_index){ @@ -3513,5 +3513,5 @@ }/*}}}*/ -/*FUNCTION Tria::Gradj {{{1*/ +/*FUNCTION Tria::Gradj {{{*/ void Tria::Gradj(Vector* gradient,int control_type,int control_index){ /*dJ/dalpha = ∂L/∂alpha = ∂J/∂alpha + ∂/∂alpha(KU-F)*/ @@ -3572,5 +3572,5 @@ } /*}}}*/ -/*FUNCTION Tria::GradjBGradient{{{1*/ +/*FUNCTION Tria::GradjBGradient{{{*/ void Tria::GradjBGradient(Vector* gradient,int weight_index,int control_index){ @@ -3612,5 +3612,5 @@ } /*}}}*/ -/*FUNCTION Tria::GradjBMacAyeal{{{1*/ +/*FUNCTION Tria::GradjBMacAyeal{{{*/ void Tria::GradjBMacAyeal(Vector* gradient,int control_index){ @@ -3669,5 +3669,5 @@ } /*}}}*/ -/*FUNCTION Tria::GradjDragMacAyeal {{{1*/ +/*FUNCTION Tria::GradjDragMacAyeal {{{*/ void Tria::GradjDragMacAyeal(Vector* gradient,int control_index){ @@ -3757,5 +3757,5 @@ } /*}}}*/ -/*FUNCTION Tria::GradjDragGradient{{{1*/ +/*FUNCTION Tria::GradjDragGradient{{{*/ void Tria::GradjDragGradient(Vector* gradient, int weight_index,int control_index){ @@ -3801,5 +3801,5 @@ } /*}}}*/ -/*FUNCTION Tria::GradjDhDtBalancedthickness{{{1*/ +/*FUNCTION Tria::GradjDhDtBalancedthickness{{{*/ void Tria::GradjDhDtBalancedthickness(Vector* gradient,int control_index){ @@ -3817,5 +3817,5 @@ } /*}}}*/ -/*FUNCTION Tria::GradjVxBalancedthickness{{{1*/ +/*FUNCTION Tria::GradjVxBalancedthickness{{{*/ void Tria::GradjVxBalancedthickness(Vector* gradient,int control_index){ @@ -3860,5 +3860,5 @@ } /*}}}*/ -/*FUNCTION Tria::GradjVyBalancedthickness{{{1*/ +/*FUNCTION Tria::GradjVyBalancedthickness{{{*/ void Tria::GradjVyBalancedthickness(Vector* gradient,int control_index){ @@ -3902,5 +3902,5 @@ } /*}}}*/ -/*FUNCTION Tria::GradientIndexing{{{1*/ +/*FUNCTION Tria::GradientIndexing{{{*/ void Tria::GradientIndexing(int* indexing,int control_index){ @@ -3916,5 +3916,5 @@ } /*}}}*/ -/*FUNCTION Tria::RheologyBbarAbsGradient{{{1*/ +/*FUNCTION Tria::RheologyBbarAbsGradient{{{*/ double Tria::RheologyBbarAbsGradient(bool process_units,int weight_index){ @@ -3960,5 +3960,5 @@ } /*}}}*/ -/*FUNCTION Tria::SurfaceAverageVelMisfit {{{1*/ +/*FUNCTION Tria::SurfaceAverageVelMisfit {{{*/ double Tria::SurfaceAverageVelMisfit(bool process_units,int weight_index){ @@ -4021,5 +4021,5 @@ } /*}}}*/ -/*FUNCTION Tria::SurfaceLogVelMisfit {{{1*/ +/*FUNCTION Tria::SurfaceLogVelMisfit {{{*/ double Tria::SurfaceLogVelMisfit(bool process_units,int weight_index){ @@ -4086,5 +4086,5 @@ } /*}}}*/ -/*FUNCTION Tria::SurfaceLogVxVyMisfit {{{1*/ +/*FUNCTION Tria::SurfaceLogVxVyMisfit {{{*/ double Tria::SurfaceLogVxVyMisfit(bool process_units,int weight_index){ @@ -4152,5 +4152,5 @@ } /*}}}*/ -/*FUNCTION Tria::SurfaceAbsVelMisfit {{{1*/ +/*FUNCTION Tria::SurfaceAbsVelMisfit {{{*/ double Tria::SurfaceAbsVelMisfit(bool process_units,int weight_index){ @@ -4213,5 +4213,5 @@ } /*}}}*/ -/*FUNCTION Tria::SurfaceRelVelMisfit {{{1*/ +/*FUNCTION Tria::SurfaceRelVelMisfit {{{*/ double Tria::SurfaceRelVelMisfit(bool process_units,int weight_index){ const int numdof=2*NUMVERTICES; @@ -4277,5 +4277,5 @@ } /*}}}*/ -/*FUNCTION Tria::ThicknessAbsGradient{{{1*/ +/*FUNCTION Tria::ThicknessAbsGradient{{{*/ double Tria::ThicknessAbsGradient(bool process_units,int weight_index){ @@ -4321,5 +4321,5 @@ } /*}}}*/ -/*FUNCTION Tria::ThicknessAbsMisfit {{{1*/ +/*FUNCTION Tria::ThicknessAbsMisfit {{{*/ double Tria::ThicknessAbsMisfit(bool process_units,int weight_index){ @@ -4366,5 +4366,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorAdjointBalancethickness{{{1*/ +/*FUNCTION Tria::CreatePVectorAdjointBalancethickness{{{*/ ElementVector* Tria::CreatePVectorAdjointBalancethickness(void){ @@ -4432,5 +4432,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorAdjointHoriz{{{1*/ +/*FUNCTION Tria::CreatePVectorAdjointHoriz{{{*/ ElementVector* Tria::CreatePVectorAdjointHoriz(void){ @@ -4611,5 +4611,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorAdjointStokes{{{1*/ +/*FUNCTION Tria::CreatePVectorAdjointStokes{{{*/ ElementVector* Tria::CreatePVectorAdjointStokes(void){ @@ -4788,5 +4788,5 @@ } /*}}}*/ -/*FUNCTION Tria::DragCoefficientAbsGradient{{{1*/ +/*FUNCTION Tria::DragCoefficientAbsGradient{{{*/ double Tria::DragCoefficientAbsGradient(bool process_units,int weight_index){ @@ -4832,5 +4832,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixAdjointBalancethickness {{{1*/ +/*FUNCTION Tria::CreateKMatrixAdjointBalancethickness {{{*/ ElementMatrix* Tria::CreateKMatrixAdjointBalancethickness(void){ @@ -4854,5 +4854,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixAdjointMacAyeal{{{1*/ +/*FUNCTION Tria::CreateKMatrixAdjointMacAyeal{{{*/ ElementMatrix* Tria::CreateKMatrixAdjointMacAyeal(void){ @@ -4924,5 +4924,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionAdjointHoriz {{{1*/ +/*FUNCTION Tria::InputUpdateFromSolutionAdjointHoriz {{{*/ void Tria::InputUpdateFromSolutionAdjointHoriz(double* solution){ @@ -4960,5 +4960,5 @@ /*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionAdjointBalancethickness {{{1*/ +/*FUNCTION Tria::InputUpdateFromSolutionAdjointBalancethickness {{{*/ void Tria::InputUpdateFromSolutionAdjointBalancethickness(double* solution){ @@ -4989,5 +4989,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetVectorFromControlInputs{{{1*/ +/*FUNCTION Tria::GetVectorFromControlInputs{{{*/ void Tria::GetVectorFromControlInputs(Vector* vector,int control_enum,int control_index,const char* data){ @@ -5017,5 +5017,5 @@ } /*}}}*/ -/*FUNCTION Tria::SetControlInputsFromVector{{{1*/ +/*FUNCTION Tria::SetControlInputsFromVector{{{*/ void Tria::SetControlInputsFromVector(double* vector,int control_enum,int control_index){ @@ -5054,5 +5054,5 @@ #ifdef _HAVE_HYDROLOGY_ -/*FUNCTION Tria::CreateHydrologyWaterVelocityInput {{{1*/ +/*FUNCTION Tria::CreateHydrologyWaterVelocityInput {{{*/ void Tria::CreateHydrologyWaterVelocityInput(void){ @@ -5109,5 +5109,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixHydrology{{{1*/ +/*FUNCTION Tria::CreateKMatrixHydrology{{{*/ ElementMatrix* Tria::CreateKMatrixHydrology(void){ @@ -5214,5 +5214,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorHydrology {{{1*/ +/*FUNCTION Tria::CreatePVectorHydrology {{{*/ ElementVector* Tria::CreatePVectorHydrology(void){ @@ -5263,5 +5263,5 @@ } /*}}}*/ -/*FUNCTION Tria::GetSolutionFromInputsHydrology{{{1*/ +/*FUNCTION Tria::GetSolutionFromInputsHydrology{{{*/ void Tria::GetSolutionFromInputsHydrology(Vector* solution){ @@ -5299,5 +5299,5 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromSolutionHydrology{{{1*/ +/*FUNCTION Tria::InputUpdateFromSolutionHydrology{{{*/ void Tria::InputUpdateFromSolutionHydrology(double* solution){ @@ -5330,5 +5330,5 @@ #ifdef _HAVE_DAKOTA_ -/*FUNCTION Tria::InputUpdateFromVectorDakota(double* vector, int name, int type);{{{1*/ +/*FUNCTION Tria::InputUpdateFromVectorDakota(double* vector, int name, int type);{{{*/ void Tria::InputUpdateFromVectorDakota(double* vector, int name, int type){ @@ -5353,5 +5353,5 @@ switch(name){ case ThicknessEnum: - /*Update thickness + surface: assume bed is constant. On ice shelves, takes hydrostatic equilibrium {{{2*/ + /*Update thickness + surface: assume bed is constant. On ice shelves, takes hydrostatic equilibrium {{{*/ double thickness[3]; double thickness_init[3]; @@ -5432,15 +5432,15 @@ } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{1*/ +/*FUNCTION Tria::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{*/ void Tria::InputUpdateFromVectorDakota(int* vector, int name, int type){ _error_(" not supported yet!"); } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{1*/ +/*FUNCTION Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{*/ void Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type){ _error_(" not supported yet!"); } /*}}}*/ -/*FUNCTION Tria::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type);{{{1*/ +/*FUNCTION Tria::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type);{{{*/ void Tria::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type){ @@ -5489,5 +5489,5 @@ #ifdef _HAVE_BALANCED_ -/*FUNCTION Tria::CreateKMatrixBalancethickness {{{1*/ +/*FUNCTION Tria::CreateKMatrixBalancethickness {{{*/ ElementMatrix* Tria::CreateKMatrixBalancethickness(void){ @@ -5503,5 +5503,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixBalancethickness_CG {{{1*/ +/*FUNCTION Tria::CreateKMatrixBalancethickness_CG {{{*/ ElementMatrix* Tria::CreateKMatrixBalancethickness_CG(void){ @@ -5613,5 +5613,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixBalancethickness_DG {{{1*/ +/*FUNCTION Tria::CreateKMatrixBalancethickness_DG {{{*/ ElementMatrix* Tria::CreateKMatrixBalancethickness_DG(void){ @@ -5667,5 +5667,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorBalancethickness{{{1*/ +/*FUNCTION Tria::CreatePVectorBalancethickness{{{*/ ElementVector* Tria::CreatePVectorBalancethickness(void){ @@ -5681,5 +5681,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorBalancethickness_CG{{{1*/ +/*FUNCTION Tria::CreatePVectorBalancethickness_CG{{{*/ ElementVector* Tria::CreatePVectorBalancethickness_CG(void){ @@ -5724,5 +5724,5 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorBalancethickness_DG {{{1*/ +/*FUNCTION Tria::CreatePVectorBalancethickness_DG {{{*/ ElementVector* Tria::CreatePVectorBalancethickness_DG(void){ Index: /issm/trunk-jpl/src/c/objects/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/Tria.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Elements/Tria.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Element.h" #include "./TriaHook.h" @@ -41,10 +41,10 @@ Results *results; - /*Tria constructors, destructors {{{1*/ + /*Tria constructors, destructors {{{*/ Tria(); Tria(int tria_id,int tria_sid,int i, IoModel* iomodel,int nummodels); ~Tria(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -54,5 +54,5 @@ Object* copy(); /*}}}*/ - /*Update virtual functions resolution: {{{1*/ + /*Update virtual functions resolution: {{{*/ void InputUpdateFromSolution(double* solutiong); void InputUpdateFromVector(double* vector, int name, int type); @@ -70,5 +70,5 @@ void InputUpdateFromIoModel(int index, IoModel* iomodel); /*}}}*/ - /*Element virtual functions definitions: {{{1*/ + /*Element virtual functions definitions: {{{*/ void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,double* vertex_response,double* qmu_part); void ComputeBasalStress(Vector* sigma_b); @@ -164,5 +164,5 @@ /*}}}*/ - /*Tria specific routines:{{{1*/ + /*Tria specific routines:{{{*/ ElementMatrix* CreateKMatrixBalancethickness(void); ElementMatrix* CreateKMatrixBalancethickness_DG(void); Index: /issm/trunk-jpl/src/c/objects/Elements/TriaHook.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/TriaHook.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Elements/TriaHook.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Object constructors and destructor*/ -/*FUNCTION TriaHook::TriaHook(){{{1*/ +/*FUNCTION TriaHook::TriaHook(){{{*/ TriaHook::TriaHook(){ numanalyses=UNDEF; @@ -29,5 +29,5 @@ } /*}}}*/ -/*FUNCTION TriaHook::~TriaHook(){{{1*/ +/*FUNCTION TriaHook::~TriaHook(){{{*/ TriaHook::~TriaHook(){ int i; @@ -42,5 +42,5 @@ } /*}}}*/ -/*FUNCTION TriaHook::TriaHook(int in_numanalyses,int matice_id, int matpar_id){{{1*/ +/*FUNCTION TriaHook::TriaHook(int in_numanalyses,int matice_id, int matpar_id){{{*/ TriaHook::TriaHook(int in_numanalyses,int matice_id, IoModel* iomodel){ @@ -64,5 +64,5 @@ /*}}}*/ -/*FUNCTION TriaHook::SetHookNodes{{{1*/ +/*FUNCTION TriaHook::SetHookNodes{{{*/ void TriaHook::SetHookNodes(int* node_ids,int analysis_counter){ Index: /issm/trunk-jpl/src/c/objects/Elements/TriaHook.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/TriaHook.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Elements/TriaHook.h (revision 12365) @@ -18,5 +18,5 @@ - /*FUNCTION constructors, destructors {{{1*/ + /*FUNCTION constructors, destructors {{{*/ TriaHook(); TriaHook(int in_numanalyses,int matice_id, IoModel* iomodel); Index: /issm/trunk-jpl/src/c/objects/Elements/TriaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Elements/TriaRef.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Elements/TriaRef.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -24,10 +24,10 @@ /*Object constructors and destructor*/ -/*FUNCTION TriaRef::TriaRef(){{{1*/ +/*FUNCTION TriaRef::TriaRef(){{{*/ TriaRef::TriaRef(){ this->element_type_list=NULL; } /*}}}*/ -/*FUNCTION TriaRef::TriaRef(int* types,int nummodels){{{1*/ +/*FUNCTION TriaRef::TriaRef(int* types,int nummodels){{{*/ TriaRef::TriaRef(const int nummodels){ @@ -38,5 +38,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::~TriaRef(){{{1*/ +/*FUNCTION TriaRef::~TriaRef(){{{*/ TriaRef::~TriaRef(){ xfree((void**)&element_type_list); @@ -45,5 +45,5 @@ /*Management*/ -/*FUNCTION TriaRef::SetElementType{{{1*/ +/*FUNCTION TriaRef::SetElementType{{{*/ void TriaRef::SetElementType(int type,int type_counter){ @@ -56,5 +56,5 @@ /*Reference Element numerics*/ -/*FUNCTION TriaRef::GetBMacAyeal {{{1*/ +/*FUNCTION TriaRef::GetBMacAyeal {{{*/ void TriaRef::GetBMacAyeal(double* B, double* xyz_list, GaussTria* gauss){ /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. @@ -86,5 +86,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetBMacAyealStokes {{{1*/ +/*FUNCTION TriaRef::GetBMacAyealStokes {{{*/ void TriaRef::GetBMacAyealStokes(double* B, double* xyz_list, GaussTria* gauss){ @@ -117,5 +117,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetSegmentBFlux{{{1*/ +/*FUNCTION TriaRef::GetSegmentBFlux{{{*/ void TriaRef::GetSegmentBFlux(double* B,GaussTria* gauss, int index1,int index2){ /*Compute B matrix. B=[phi1 phi2 -phi3 -phi4] @@ -136,5 +136,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetSegmentBprimeFlux{{{1*/ +/*FUNCTION TriaRef::GetSegmentBprimeFlux{{{*/ void TriaRef::GetSegmentBprimeFlux(double* Bprime,GaussTria* gauss, int index1,int index2){ /*Compute Bprime matrix. Bprime=[phi1 phi2 phi3 phi4] @@ -155,5 +155,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetBPrognostic{{{1*/ +/*FUNCTION TriaRef::GetBPrognostic{{{*/ void TriaRef::GetBPrognostic(double* B_prog, double* xyz_list, GaussTria* gauss){ /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. @@ -179,5 +179,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetBprimeMacAyeal {{{1*/ +/*FUNCTION TriaRef::GetBprimeMacAyeal {{{*/ void TriaRef::GetBprimeMacAyeal(double* Bprime, double* xyz_list, GaussTria* gauss){ @@ -210,5 +210,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetBprimeMacAyealStokes {{{1*/ +/*FUNCTION TriaRef::GetBprimeMacAyealStokes {{{*/ void TriaRef::GetBprimeMacAyealStokes(double* Bprime, double* xyz_list, GaussTria* gauss){ @@ -244,5 +244,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetBprimePrognostic{{{1*/ +/*FUNCTION TriaRef::GetBprimePrognostic{{{*/ void TriaRef::GetBprimePrognostic(double* Bprime_prog, double* xyz_list, GaussTria* gauss){ /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. @@ -269,5 +269,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetL{{{1*/ +/*FUNCTION TriaRef::GetL{{{*/ void TriaRef::GetL(double* L, double* xyz_list,GaussTria* gauss,int numdof){ /*Compute L matrix. L=[L1 L2 L3] where Li is square and of size numdof. @@ -306,5 +306,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetJacobian{{{1*/ +/*FUNCTION TriaRef::GetJacobian{{{*/ void TriaRef::GetJacobian(double* J, double* xyz_list,GaussTria* gauss){ /*The Jacobian is constant over the element, discard the gaussian points. @@ -326,5 +326,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetSegmentJacobianDeterminant{{{1*/ +/*FUNCTION TriaRef::GetSegmentJacobianDeterminant{{{*/ void TriaRef::GetSegmentJacobianDeterminant(double* Jdet, double* xyz_list,GaussTria* gauss){ /*The Jacobian determinant is constant over the element, discard the gaussian points. @@ -342,5 +342,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetJacobianDeterminant2d{{{1*/ +/*FUNCTION TriaRef::GetJacobianDeterminant2d{{{*/ void TriaRef::GetJacobianDeterminant2d(double* Jdet, double* xyz_list,GaussTria* gauss){ /*The Jacobian determinant is constant over the element, discard the gaussian points. @@ -357,5 +357,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetJacobianDeterminant3d {{{1*/ +/*FUNCTION TriaRef::GetJacobianDeterminant3d {{{*/ void TriaRef::GetJacobianDeterminant3d(double* Jdet, double* xyz_list,GaussTria* gauss){ /*The Jacobian determinant is constant over the element, discard the gaussian points. @@ -379,5 +379,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetJacobianInvert{{{1*/ +/*FUNCTION TriaRef::GetJacobianInvert{{{*/ void TriaRef::GetJacobianInvert(double* Jinv, double* xyz_list,GaussTria* gauss){ @@ -393,5 +393,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetNodalFunctions{{{1*/ +/*FUNCTION TriaRef::GetNodalFunctions{{{*/ void TriaRef::GetNodalFunctions(double* basis,GaussTria* gauss){ /*This routine returns the values of the nodal functions at the gaussian point.*/ @@ -403,5 +403,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetSegmentNodalFunctions{{{1*/ +/*FUNCTION TriaRef::GetSegmentNodalFunctions{{{*/ void TriaRef::GetSegmentNodalFunctions(double* basis,GaussTria* gauss,int index1,int index2){ /*This routine returns the values of the nodal functions at the gaussian point.*/ @@ -417,5 +417,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetNodalFunctionsDerivatives{{{1*/ +/*FUNCTION TriaRef::GetNodalFunctionsDerivatives{{{*/ void TriaRef::GetNodalFunctionsDerivatives(double* dbasis,double* xyz_list, GaussTria* gauss){ @@ -444,5 +444,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetNodalFunctionsDerivativesReference{{{1*/ +/*FUNCTION TriaRef::GetNodalFunctionsDerivativesReference{{{*/ void TriaRef::GetNodalFunctionsDerivativesReference(double* dl1dl3,GaussTria* gauss){ /*This routine returns the values of the nodal functions derivatives (with respect to the @@ -463,5 +463,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetInputDerivativeValue{{{1*/ +/*FUNCTION TriaRef::GetInputDerivativeValue{{{*/ void TriaRef::GetInputDerivativeValue(double* p, double* plist,double* xyz_list, GaussTria* gauss){ @@ -486,5 +486,5 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetInputValue{{{1*/ +/*FUNCTION TriaRef::GetInputValue{{{*/ void TriaRef::GetInputValue(double* p, double* plist, GaussTria* gauss){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*BoolExternalResult constructors and destructor*/ -/*FUNCTION BoolExternalResult::BoolExternalResult(){{{1*/ +/*FUNCTION BoolExternalResult::BoolExternalResult(){{{*/ BoolExternalResult::BoolExternalResult(){ return; } /*}}}*/ -/*FUNCTION BoolExternalResult::BoolExternalResult(int enum_type,bool value){{{1*/ +/*FUNCTION BoolExternalResult::BoolExternalResult(int enum_type,bool value){{{*/ BoolExternalResult::BoolExternalResult(int in_id, int in_enum_type,bool in_value,int in_step, double in_time){ @@ -36,5 +36,5 @@ } /*}}}*/ -/*FUNCTION BoolExternalResult::~BoolExternalResult(){{{1*/ +/*FUNCTION BoolExternalResult::~BoolExternalResult(){{{*/ BoolExternalResult::~BoolExternalResult(){ return; @@ -43,10 +43,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION BoolExternalResult::Echo {{{1*/ +/*FUNCTION BoolExternalResult::Echo {{{*/ void BoolExternalResult::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION BoolExternalResult::DeepEcho{{{1*/ +/*FUNCTION BoolExternalResult::DeepEcho{{{*/ void BoolExternalResult::DeepEcho(void){ @@ -59,8 +59,8 @@ } /*}}}*/ -/*FUNCTION BoolExternalResult::Id{{{1*/ +/*FUNCTION BoolExternalResult::Id{{{*/ int BoolExternalResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION BoolExternalResult::MyRank{{{1*/ +/*FUNCTION BoolExternalResult::MyRank{{{*/ int BoolExternalResult::MyRank(void){ extern int my_rank; @@ -68,5 +68,5 @@ } /*}}}*/ -/*FUNCTION BoolExternalResult::ObjectEnum{{{1*/ +/*FUNCTION BoolExternalResult::ObjectEnum{{{*/ int BoolExternalResult::ObjectEnum(void){ @@ -75,5 +75,5 @@ } /*}}}*/ -/*FUNCTION BoolExternalResult::copy{{{1*/ +/*FUNCTION BoolExternalResult::copy{{{*/ Object* BoolExternalResult::copy() { @@ -84,5 +84,5 @@ /*BoolExternalResult management: */ -/*FUNCTION BoolExternalResult::WriteData{{{1*/ +/*FUNCTION BoolExternalResult::WriteData{{{*/ void BoolExternalResult::WriteData(FILE* fid,bool io_gather){ @@ -119,11 +119,11 @@ } -/*}}}1*/ -/*FUNCTION BoolExternalResult::GetResultName{{{1*/ +/*}}}*/ +/*FUNCTION BoolExternalResult::GetResultName{{{*/ void BoolExternalResult::GetResultName(char** pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION BoolExternalResult::GetStep{{{1*/ +/*FUNCTION BoolExternalResult::GetStep{{{*/ int BoolExternalResult::GetStep(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/BoolExternalResult.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H @@ -32,10 +32,10 @@ double time; - /*BoolExternalResult constructors, destructors: {{{1*/ + /*BoolExternalResult constructors, destructors: {{{*/ BoolExternalResult(); BoolExternalResult(int id, int enum_type,bool value,int step,double time); ~BoolExternalResult(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -45,5 +45,5 @@ Object* copy(); /*}}}*/ - /*ExternalResult management: {{{1*/ + /*ExternalResult management: {{{*/ int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*DoubleExternalResult constructors and destructor*/ -/*FUNCTION DoubleExternalResult::DoubleExternalResult(){{{1*/ +/*FUNCTION DoubleExternalResult::DoubleExternalResult(){{{*/ DoubleExternalResult::DoubleExternalResult(){ return; } /*}}}*/ -/*FUNCTION DoubleExternalResult::DoubleExternalResult(int enum_type,double value){{{1*/ +/*FUNCTION DoubleExternalResult::DoubleExternalResult(int enum_type,double value){{{*/ DoubleExternalResult::DoubleExternalResult(int in_id, int in_enum_type,double in_value,int in_step, double in_time){ @@ -36,5 +36,5 @@ } /*}}}*/ -/*FUNCTION DoubleExternalResult::~DoubleExternalResult(){{{1*/ +/*FUNCTION DoubleExternalResult::~DoubleExternalResult(){{{*/ DoubleExternalResult::~DoubleExternalResult(){ return; @@ -43,10 +43,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION DoubleExternalResult::Echo {{{1*/ +/*FUNCTION DoubleExternalResult::Echo {{{*/ void DoubleExternalResult::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION DoubleExternalResult::DeepEcho{{{1*/ +/*FUNCTION DoubleExternalResult::DeepEcho{{{*/ void DoubleExternalResult::DeepEcho(void){ @@ -59,8 +59,8 @@ } /*}}}*/ -/*FUNCTION DoubleExternalResult::Id{{{1*/ +/*FUNCTION DoubleExternalResult::Id{{{*/ int DoubleExternalResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleExternalResult::MyRank{{{1*/ +/*FUNCTION DoubleExternalResult::MyRank{{{*/ int DoubleExternalResult::MyRank(void){ extern int my_rank; @@ -68,5 +68,5 @@ } /*}}}*/ -/*FUNCTION DoubleExternalResult::ObjectEnum{{{1*/ +/*FUNCTION DoubleExternalResult::ObjectEnum{{{*/ int DoubleExternalResult::ObjectEnum(void){ @@ -75,5 +75,5 @@ } /*}}}*/ -/*FUNCTION DoubleExternalResult::copy{{{1*/ +/*FUNCTION DoubleExternalResult::copy{{{*/ Object* DoubleExternalResult::copy() { @@ -84,5 +84,5 @@ /*DoubleExternalResult management: */ -/*FUNCTION DoubleExternalResult::WriteData{{{1*/ +/*FUNCTION DoubleExternalResult::WriteData{{{*/ void DoubleExternalResult::WriteData(FILE* fid,bool io_gather){ @@ -115,11 +115,11 @@ } -/*}}}1*/ -/*FUNCTION DoubleExternalResult::GetResultName{{{1*/ +/*}}}*/ +/*FUNCTION DoubleExternalResult::GetResultName{{{*/ void DoubleExternalResult::GetResultName(char** pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION DoubleExternalResult::GetStep{{{1*/ +/*FUNCTION DoubleExternalResult::GetStep{{{*/ int DoubleExternalResult::GetStep(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleExternalResult.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H @@ -34,10 +34,10 @@ - /*DoubleExternalResult constructors, destructors: {{{1*/ + /*DoubleExternalResult constructors, destructors: {{{*/ DoubleExternalResult(); DoubleExternalResult(int id,int enum_type,double value,int step,double time); ~DoubleExternalResult(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -47,5 +47,5 @@ Object* copy(); /*}}}*/ - /*ExternalResult management: {{{1*/ + /*ExternalResult management: {{{*/ int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*DoubleMatExternalResult constructors and destructor*/ -/*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(){{{1*/ +/*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(){{{*/ DoubleMatExternalResult::DoubleMatExternalResult(){ return; } /*}}}*/ -/*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int enum_type,IssmDoubleMat values,int M,int N,int in_step,double in_time){{{1*/ +/*FUNCTION DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int enum_type,IssmDoubleMat values,int M,int N,int in_step,double in_time){{{*/ DoubleMatExternalResult::DoubleMatExternalResult(int in_id, int in_enum_type,double* in_values, int in_M,int in_N,int in_step,double in_time){ @@ -45,5 +45,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatExternalResult::~DoubleMatExternalResult(){{{1*/ +/*FUNCTION DoubleMatExternalResult::~DoubleMatExternalResult(){{{*/ DoubleMatExternalResult::~DoubleMatExternalResult(){ @@ -54,5 +54,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION DoubleMatExternalResult::Echo {{{1*/ +/*FUNCTION DoubleMatExternalResult::Echo {{{*/ void DoubleMatExternalResult::Echo(void){ @@ -65,5 +65,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatExternalResult::DeepEcho{{{1*/ +/*FUNCTION DoubleMatExternalResult::DeepEcho{{{*/ void DoubleMatExternalResult::DeepEcho(void){ @@ -87,8 +87,8 @@ } /*}}}*/ -/*FUNCTION DoubleMatExternalResult::Id{{{1*/ +/*FUNCTION DoubleMatExternalResult::Id{{{*/ int DoubleMatExternalResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleMatExternalResult::MyRank{{{1*/ +/*FUNCTION DoubleMatExternalResult::MyRank{{{*/ int DoubleMatExternalResult::MyRank(void){ extern int my_rank; @@ -96,5 +96,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatExternalResult::ObjectEnum{{{1*/ +/*FUNCTION DoubleMatExternalResult::ObjectEnum{{{*/ int DoubleMatExternalResult::ObjectEnum(void){ @@ -103,5 +103,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatExternalResult::copy{{{1*/ +/*FUNCTION DoubleMatExternalResult::copy{{{*/ Object* DoubleMatExternalResult::copy() { @@ -112,5 +112,5 @@ /*DoubleMatExternalResult management: */ -/*FUNCTION DoubleMatExternalResult::WriteData{{{1*/ +/*FUNCTION DoubleMatExternalResult::WriteData{{{*/ void DoubleMatExternalResult::WriteData(FILE* fid,bool io_gather){ @@ -147,11 +147,11 @@ } -/*}}}1*/ -/*FUNCTION DoubleMatExternalResult::GetResultName{{{1*/ +/*}}}*/ +/*FUNCTION DoubleMatExternalResult::GetResultName{{{*/ void DoubleMatExternalResult::GetResultName(char** pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION DoubleMatExternalResult::GetStep{{{1*/ +/*FUNCTION DoubleMatExternalResult::GetStep{{{*/ int DoubleMatExternalResult::GetStep(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H @@ -34,10 +34,10 @@ public: - /*DoubleMatExternalResult constructors, destructors: {{{1*/ + /*DoubleMatExternalResult constructors, destructors: {{{*/ DoubleMatExternalResult(); DoubleMatExternalResult(int id,int enum_type,double* values,int M,int N,int step, double time); ~DoubleMatExternalResult(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -47,5 +47,5 @@ Object* copy(); /*}}}*/ - /*ExternalResult managemnet: {{{1*/ + /*ExternalResult managemnet: {{{*/ int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*DoubleVecExternalResult constructors and destructor*/ -/*FUNCTION DoubleVecExternalResult::DoubleVecExternalResult(){{{1*/ +/*FUNCTION DoubleVecExternalResult::DoubleVecExternalResult(){{{*/ DoubleVecExternalResult::DoubleVecExternalResult(){ return; } /*}}}*/ -/*FUNCTION DoubleVecExternalResult::DoubleVecExternalResult(int enum_type,IssmDoubleVec values,int M,int in_step,double in_time){{{1*/ +/*FUNCTION DoubleVecExternalResult::DoubleVecExternalResult(int enum_type,IssmDoubleVec values,int M,int in_step,double in_time){{{*/ DoubleVecExternalResult::DoubleVecExternalResult(int in_id, int in_enum_type,double* in_values, int in_M,int in_step,double in_time){ @@ -43,5 +43,5 @@ } /*}}}*/ -/*FUNCTION DoubleVecExternalResult::~DoubleVecExternalResult(){{{1*/ +/*FUNCTION DoubleVecExternalResult::~DoubleVecExternalResult(){{{*/ DoubleVecExternalResult::~DoubleVecExternalResult(){ xfree((void**)&values); @@ -51,5 +51,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION DoubleVecExternalResult::Echo {{{1*/ +/*FUNCTION DoubleVecExternalResult::Echo {{{*/ void DoubleVecExternalResult::Echo(void){ @@ -62,5 +62,5 @@ } /*}}}*/ -/*FUNCTION DoubleVecExternalResult::DeepEcho{{{1*/ +/*FUNCTION DoubleVecExternalResult::DeepEcho{{{*/ void DoubleVecExternalResult::DeepEcho(void){ @@ -78,8 +78,8 @@ } /*}}}*/ -/*FUNCTION DoubleVecExternalResult::Id{{{1*/ +/*FUNCTION DoubleVecExternalResult::Id{{{*/ int DoubleVecExternalResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleVecExternalResult::MyRank{{{1*/ +/*FUNCTION DoubleVecExternalResult::MyRank{{{*/ int DoubleVecExternalResult::MyRank(void){ extern int my_rank; @@ -87,5 +87,5 @@ } /*}}}*/ -/*FUNCTION DoubleVecExternalResult::ObjectEnum{{{1*/ +/*FUNCTION DoubleVecExternalResult::ObjectEnum{{{*/ int DoubleVecExternalResult::ObjectEnum(void){ @@ -94,5 +94,5 @@ } /*}}}*/ -/*FUNCTION DoubleVecExternalResult::copy{{{1*/ +/*FUNCTION DoubleVecExternalResult::copy{{{*/ Object* DoubleVecExternalResult::copy() { @@ -103,5 +103,5 @@ /*DoubleVecExternalResult management: */ -/*FUNCTION DoubleVecExternalResult::WriteData{{{1*/ +/*FUNCTION DoubleVecExternalResult::WriteData{{{*/ void DoubleVecExternalResult::WriteData(FILE* fid,bool io_gather){ @@ -134,11 +134,11 @@ } -/*}}}1*/ -/*FUNCTION DoubleVecExternalResult::GetResultName{{{1*/ +/*}}}*/ +/*FUNCTION DoubleVecExternalResult::GetResultName{{{*/ void DoubleVecExternalResult::GetResultName(char** pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION DoubleVecExternalResult::GetStep{{{1*/ +/*FUNCTION DoubleVecExternalResult::GetStep{{{*/ int DoubleVecExternalResult::GetStep(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/DoubleVecExternalResult.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H @@ -33,10 +33,10 @@ public: - /*DoubleVecExternalResult constructors, destructors: {{{1*/ + /*DoubleVecExternalResult constructors, destructors: {{{*/ DoubleVecExternalResult(); DoubleVecExternalResult(int id,int enum_type,double* values,int M,int step, double time); ~DoubleVecExternalResult(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -46,5 +46,5 @@ Object* copy(); /*}}}*/ - /*ExternalResult management: {{{1*/ + /*ExternalResult management: {{{*/ int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/ExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/ExternalResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/ExternalResult.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H @@ -25,5 +25,5 @@ virtual ~ExternalResult(){}; - /*Virtual functions:{{{1*/ + /*Virtual functions:{{{*/ virtual int InstanceEnum()=0; virtual void WriteData(FILE* fid,bool io_gather)=0; Index: /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*IntExternalResult constructors and destructor*/ -/*FUNCTION IntExternalResult::IntExternalResult(){{{1*/ +/*FUNCTION IntExternalResult::IntExternalResult(){{{*/ IntExternalResult::IntExternalResult(){ return; } /*}}}*/ -/*FUNCTION IntExternalResult::IntExternalResult(int in_id, int in_enum_type,int in_value,int in_step, double in_time){{{1*/ +/*FUNCTION IntExternalResult::IntExternalResult(int in_id, int in_enum_type,int in_value,int in_step, double in_time){{{*/ IntExternalResult::IntExternalResult(int in_id, int in_enum_type,int in_value,int in_step, double in_time){ @@ -36,5 +36,5 @@ } /*}}}*/ -/*FUNCTION IntExternalResult::~IntExternalResult(){{{1*/ +/*FUNCTION IntExternalResult::~IntExternalResult(){{{*/ IntExternalResult::~IntExternalResult(){ return; @@ -43,10 +43,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION IntExternalResult::Echo {{{1*/ +/*FUNCTION IntExternalResult::Echo {{{*/ void IntExternalResult::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION IntExternalResult::DeepEcho{{{1*/ +/*FUNCTION IntExternalResult::DeepEcho{{{*/ void IntExternalResult::DeepEcho(void){ @@ -59,8 +59,8 @@ } /*}}}*/ -/*FUNCTION IntExternalResult::Id{{{1*/ +/*FUNCTION IntExternalResult::Id{{{*/ int IntExternalResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION IntExternalResult::MyRank{{{1*/ +/*FUNCTION IntExternalResult::MyRank{{{*/ int IntExternalResult::MyRank(void){ extern int my_rank; @@ -68,5 +68,5 @@ } /*}}}*/ -/*FUNCTION IntExternalResult::ObjectEnum{{{1*/ +/*FUNCTION IntExternalResult::ObjectEnum{{{*/ int IntExternalResult::ObjectEnum(void){ @@ -75,5 +75,5 @@ } /*}}}*/ -/*FUNCTION IntExternalResult::copy{{{1*/ +/*FUNCTION IntExternalResult::copy{{{*/ Object* IntExternalResult::copy() { @@ -84,5 +84,5 @@ /*IntExternalResult management: */ -/*FUNCTION IntExternalResult::WriteData{{{1*/ +/*FUNCTION IntExternalResult::WriteData{{{*/ void IntExternalResult::WriteData(FILE* fid,bool io_gather){ @@ -119,11 +119,11 @@ } -/*}}}1*/ -/*FUNCTION IntExternalResult::GetResultName{{{1*/ +/*}}}*/ +/*FUNCTION IntExternalResult::GetResultName{{{*/ void IntExternalResult::GetResultName(char** pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION IntExternalResult::GetStep{{{1*/ +/*FUNCTION IntExternalResult::GetStep{{{*/ int IntExternalResult::GetStep(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/IntExternalResult.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H @@ -31,5 +31,5 @@ - /*IntExternalResult constructors, destructors: {{{1*/ + /*IntExternalResult constructors, destructors: {{{*/ IntExternalResult(); IntExternalResult(int id,int enum_type,int value,int step,double time); @@ -37,5 +37,5 @@ /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -45,5 +45,5 @@ Object* copy(); /*}}}*/ - /*ExternalResult managemnet: {{{1*/ + /*ExternalResult managemnet: {{{*/ int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*PetscVecExternalResult constructors and destructor*/ -/*FUNCTION PetscVecExternalResult::PetscVecExternalResult(){{{1*/ +/*FUNCTION PetscVecExternalResult::PetscVecExternalResult(){{{*/ PetscVecExternalResult::PetscVecExternalResult(){ return; } /*}}}*/ -/*FUNCTION PetscVecExternalResult::PetscVecExternalResult(int enum_type,IssmPetscVec value){{{1*/ +/*FUNCTION PetscVecExternalResult::PetscVecExternalResult(int enum_type,IssmPetscVec value){{{*/ PetscVecExternalResult::PetscVecExternalResult(int in_id, int in_enum_type,Vector* in_value,int in_step, double in_time){ @@ -44,5 +44,5 @@ } /*}}}*/ -/*FUNCTION PetscVecExternalResult::~PetscVecExternalResult(){{{1*/ +/*FUNCTION PetscVecExternalResult::~PetscVecExternalResult(){{{*/ PetscVecExternalResult::~PetscVecExternalResult(){ VecFree(&value); @@ -51,5 +51,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION PetscVecExternalResult::Echo {{{1*/ +/*FUNCTION PetscVecExternalResult::Echo {{{*/ void PetscVecExternalResult::Echo(void){ @@ -59,5 +59,5 @@ } /*}}}*/ -/*FUNCTION PetscVecExternalResult::DeepEcho{{{1*/ +/*FUNCTION PetscVecExternalResult::DeepEcho{{{*/ void PetscVecExternalResult::DeepEcho(void){ @@ -71,8 +71,8 @@ } /*}}}*/ -/*FUNCTION PetscVecExternalResult::Id{{{1*/ +/*FUNCTION PetscVecExternalResult::Id{{{*/ int PetscVecExternalResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION PetscVecExternalResult::MyRank{{{1*/ +/*FUNCTION PetscVecExternalResult::MyRank{{{*/ int PetscVecExternalResult::MyRank(void){ extern int my_rank; @@ -80,5 +80,5 @@ } /*}}}*/ -/*FUNCTION PetscVecExternalResult::ObjectEnum{{{1*/ +/*FUNCTION PetscVecExternalResult::ObjectEnum{{{*/ int PetscVecExternalResult::ObjectEnum(void){ @@ -87,5 +87,5 @@ } /*}}}*/ -/*FUNCTION PetscVecExternalResult::copy{{{1*/ +/*FUNCTION PetscVecExternalResult::copy{{{*/ Object* PetscVecExternalResult::copy() { @@ -96,5 +96,5 @@ /*PetscVecExternalResult management: */ -/*FUNCTION PetscVecExternalResult::WriteData{{{1*/ +/*FUNCTION PetscVecExternalResult::WriteData{{{*/ void PetscVecExternalResult::WriteData(FILE* fid,bool io_gather){ @@ -134,11 +134,11 @@ xfree((void**)&serialvec); } -/*}}}1*/ -/*FUNCTION PetscVecExternalResult::GetResultName{{{1*/ +/*}}}*/ +/*FUNCTION PetscVecExternalResult::GetResultName{{{*/ void PetscVecExternalResult::GetResultName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION PetscVecExternalResult::GetStep{{{1*/ +/*FUNCTION PetscVecExternalResult::GetStep{{{*/ int PetscVecExternalResult::GetStep(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/PetscVecExternalResult.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H @@ -33,10 +33,10 @@ public: - /*PetscVecExternalResult constructors, destructors: {{{1*/ + /*PetscVecExternalResult constructors, destructors: {{{*/ PetscVecExternalResult(); PetscVecExternalResult(int id,int enum_type,Vector* value, int step, double time); ~PetscVecExternalResult(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -46,5 +46,5 @@ Object* copy(); /*}}}*/ - /*ExternalResult management: {{{1*/ + /*ExternalResult management: {{{*/ int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); Index: /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*StringExternalResult constructors and destructor*/ -/*FUNCTION StringExternalResult::StringExternalResult(){{{1*/ +/*FUNCTION StringExternalResult::StringExternalResult(){{{*/ StringExternalResult::StringExternalResult(){ return; } /*}}}*/ -/*FUNCTION StringExternalResult::StringExternalResult(int enum_type,IssmString value){{{1*/ +/*FUNCTION StringExternalResult::StringExternalResult(int enum_type,IssmString value){{{*/ StringExternalResult::StringExternalResult(int in_id, int in_enum_type,char* in_value,int in_step, double in_time){ @@ -39,5 +39,5 @@ } /*}}}*/ -/*FUNCTION StringExternalResult::~StringExternalResult(){{{1*/ +/*FUNCTION StringExternalResult::~StringExternalResult(){{{*/ StringExternalResult::~StringExternalResult(){ xfree((void**)&value); @@ -46,10 +46,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION StringExternalResult::Echo {{{1*/ +/*FUNCTION StringExternalResult::Echo {{{*/ void StringExternalResult::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION StringExternalResult::DeepEcho{{{1*/ +/*FUNCTION StringExternalResult::DeepEcho{{{*/ void StringExternalResult::DeepEcho(void){ @@ -62,8 +62,8 @@ } /*}}}*/ -/*FUNCTION StringExternalResult::Id{{{1*/ +/*FUNCTION StringExternalResult::Id{{{*/ int StringExternalResult::Id(void){ return -1; } /*}}}*/ -/*FUNCTION StringExternalResult::MyRank{{{1*/ +/*FUNCTION StringExternalResult::MyRank{{{*/ int StringExternalResult::MyRank(void){ extern int my_rank; @@ -71,5 +71,5 @@ } /*}}}*/ -/*FUNCTION StringExternalResult::ObjectEnum{{{1*/ +/*FUNCTION StringExternalResult::ObjectEnum{{{*/ int StringExternalResult::ObjectEnum(void){ @@ -78,5 +78,5 @@ } /*}}}*/ -/*FUNCTION StringExternalResult::copy{{{1*/ +/*FUNCTION StringExternalResult::copy{{{*/ Object* StringExternalResult::copy() { @@ -87,5 +87,5 @@ /*StringExternalResult management: */ -/*FUNCTION StringExternalResult::WriteData{{{1*/ +/*FUNCTION StringExternalResult::WriteData{{{*/ void StringExternalResult::WriteData(FILE* fid,bool io_gather){ @@ -118,11 +118,11 @@ } -/*}}}1*/ -/*FUNCTION StringExternalResult::GetResultName{{{1*/ +/*}}}*/ +/*FUNCTION StringExternalResult::GetResultName{{{*/ void StringExternalResult::GetResultName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION StringExternalResult::GetStep{{{1*/ +/*FUNCTION StringExternalResult::GetStep{{{*/ int StringExternalResult::GetStep(void){ Index: /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.h =================================================================== --- /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/ExternalResults/StringExternalResult.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H @@ -33,10 +33,10 @@ public: - /*StringExternalResult constructors, destructors: {{{1*/ + /*StringExternalResult constructors, destructors: {{{*/ StringExternalResult(); StringExternalResult(int id,int enum_type,char* value,int step, double time); ~StringExternalResult(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -46,5 +46,5 @@ Object* copy(); /*}}}*/ - /*ExternalResult management: {{{1*/ + /*ExternalResult management: {{{*/ int InstanceEnum(){return enum_type;} void WriteData(FILE* fid,bool io_gather); Index: /issm/trunk-jpl/src/c/objects/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/FemModel.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/FemModel.cpp (revision 12365) @@ -20,5 +20,5 @@ /*Object constructors and destructor*/ -/*FUNCTION FemModel::constructor {{{1*/ +/*FUNCTION FemModel::constructor {{{*/ FemModel::FemModel(char* inputfilename, char* outputfilename, const int in_solution_type,const int* analyses,const int nummodels){ @@ -77,6 +77,6 @@ } -/*}}}1*/ -/*FUNCTION FemModel::destructor {{{1*/ +/*}}}*/ +/*FUNCTION FemModel::destructor {{{*/ FemModel::~FemModel(){ @@ -96,8 +96,8 @@ } -/*}}}1*/ +/*}}}*/ /*Object management*/ -/*FUNCTION FemModel::Echo {{{1*/ +/*FUNCTION FemModel::Echo {{{*/ void FemModel::Echo(void){ @@ -113,5 +113,5 @@ /*Numerics: */ -/*FUNCTION FemModel::SetCurrentConfiguration(int configuration_type,int analysis_type){{{1*/ +/*FUNCTION FemModel::SetCurrentConfiguration(int configuration_type,int analysis_type){{{*/ void FemModel::SetCurrentConfiguration(int configuration_type,int analysis_type){ @@ -150,6 +150,6 @@ } -/*}}}1*/ -/*FUNCTION FemModel::SetCurrentConfiguration(int configuration_type){{{1*/ +/*}}}*/ +/*FUNCTION FemModel::SetCurrentConfiguration(int configuration_type){{{*/ void FemModel::SetCurrentConfiguration(int configuration_type){ @@ -157,3 +157,3 @@ this->SetCurrentConfiguration(configuration_type,configuration_type); } -/*}}}1*/ +/*}}}*/ Index: /issm/trunk-jpl/src/c/objects/FemModel.h =================================================================== --- /issm/trunk-jpl/src/c/objects/FemModel.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/FemModel.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Object.h" #include "../toolkits/toolkits.h" Index: /issm/trunk-jpl/src/c/objects/Gauss/GaussPenta.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Gauss/GaussPenta.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Gauss/GaussPenta.cpp (revision 12365) @@ -3,10 +3,10 @@ */ -/*Include files: {{{1*/ +/*Include files: {{{*/ #include "./../objects.h" /*}}}*/ /*GaussPenta constructors and destructors:*/ -/*FUNCTION GaussPenta::GaussPenta() {{{1*/ +/*FUNCTION GaussPenta::GaussPenta() {{{*/ GaussPenta::GaussPenta(){ @@ -26,5 +26,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::GaussPenta(int order_horiz,int order_vert) {{{1*/ +/*FUNCTION GaussPenta::GaussPenta(int order_horiz,int order_vert) {{{*/ GaussPenta::GaussPenta(int order_horiz,int order_vert){ @@ -80,5 +80,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int order){{{1*/ +/*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int order){{{*/ GaussPenta::GaussPenta(int index1, int index2,int order){ @@ -137,5 +137,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int index3, int order){{{1*/ +/*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int index3, int order){{{*/ GaussPenta::GaussPenta(int index1, int index2, int index3, int order){ @@ -166,5 +166,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int index3, int index4,int order_horiz,int order_vert){{{1*/ +/*FUNCTION GaussPenta::GaussPenta(int index1, int index2, int index3, int index4,int order_horiz,int order_vert){{{*/ GaussPenta::GaussPenta(int index1, int index2, int index3, int index4,int order_horiz,int order_vert){ @@ -233,5 +233,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::~GaussPenta(){{{1*/ +/*FUNCTION GaussPenta::~GaussPenta(){{{*/ GaussPenta::~GaussPenta(){ xfree((void**)&weights); @@ -244,5 +244,5 @@ /*Methods*/ -/*FUNCTION GaussPenta::Echo{{{1*/ +/*FUNCTION GaussPenta::Echo{{{*/ void GaussPenta::Echo(void){ @@ -289,5 +289,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::GaussCenter{{{1*/ +/*FUNCTION GaussPenta::GaussCenter{{{*/ void GaussPenta::GaussCenter(void){ @@ -300,5 +300,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::GaussPoint{{{1*/ +/*FUNCTION GaussPenta::GaussPoint{{{*/ void GaussPenta::GaussPoint(int ig){ @@ -315,5 +315,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::GaussVertex{{{1*/ +/*FUNCTION GaussPenta::GaussVertex{{{*/ void GaussPenta::GaussVertex(int iv){ @@ -348,5 +348,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::GaussFaceTria{{{1*/ +/*FUNCTION GaussPenta::GaussFaceTria{{{*/ void GaussPenta::GaussFaceTria(int index1, int index2, int index3, int order){ @@ -366,5 +366,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::begin{{{1*/ +/*FUNCTION GaussPenta::begin{{{*/ int GaussPenta::begin(void){ @@ -381,5 +381,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::end{{{1*/ +/*FUNCTION GaussPenta::end{{{*/ int GaussPenta::end(void){ @@ -396,5 +396,5 @@ } /*}}}*/ -/*FUNCTION GaussPenta::SynchronizeGaussTria{{{1*/ +/*FUNCTION GaussPenta::SynchronizeGaussTria{{{*/ void GaussPenta::SynchronizeGaussTria(GaussTria* gauss_tria){ Index: /issm/trunk-jpl/src/c/objects/Gauss/GaussPenta.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Gauss/GaussPenta.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Gauss/GaussPenta.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./../../shared/shared.h" class GaussTria; Index: /issm/trunk-jpl/src/c/objects/Gauss/GaussTria.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Gauss/GaussTria.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Gauss/GaussTria.cpp (revision 12365) @@ -3,10 +3,10 @@ */ -/*Include files: {{{1*/ +/*Include files: {{{*/ #include "./../objects.h" /*}}}*/ /*GaussTria constructors and destructors:*/ -/*FUNCTION GaussTria::GaussTria() {{{1*/ +/*FUNCTION GaussTria::GaussTria() {{{*/ GaussTria::GaussTria(){ @@ -24,5 +24,5 @@ } /*}}}*/ -/*FUNCTION GaussTria::GaussTria(int order) {{{1*/ +/*FUNCTION GaussTria::GaussTria(int order) {{{*/ GaussTria::GaussTria(int order){ @@ -38,5 +38,5 @@ } /*}}}*/ -/*FUNCTION GaussTria::GaussTria(int index1,int index2,int order) {{{1*/ +/*FUNCTION GaussTria::GaussTria(int index1,int index2,int order) {{{*/ GaussTria::GaussTria(int index1,int index2,int order){ @@ -95,5 +95,5 @@ } /*}}}*/ -/*FUNCTION GaussTria::~GaussTria(){{{1*/ +/*FUNCTION GaussTria::~GaussTria(){{{*/ GaussTria::~GaussTria(){ xfree((void**)&weights); @@ -105,5 +105,5 @@ /*Methods*/ -/*FUNCTION GaussTria::Echo{{{1*/ +/*FUNCTION GaussTria::Echo{{{*/ void GaussTria::Echo(void){ @@ -143,5 +143,5 @@ } /*}}}*/ -/*FUNCTION GaussTria::GaussCenter{{{1*/ +/*FUNCTION GaussTria::GaussCenter{{{*/ void GaussTria::GaussCenter(void){ @@ -153,5 +153,5 @@ } /*}}}*/ -/*FUNCTION GaussTria::GaussEdgeCenter{{{1*/ +/*FUNCTION GaussTria::GaussEdgeCenter{{{*/ void GaussTria::GaussEdgeCenter(int index1,int index2){ @@ -184,5 +184,5 @@ } /*}}}*/ -/*FUNCTION GaussTria::GaussPoint{{{1*/ +/*FUNCTION GaussTria::GaussPoint{{{*/ void GaussTria::GaussPoint(int ig){ @@ -198,5 +198,5 @@ } /*}}}*/ -/*FUNCTION GaussTria::GaussFromCoords{{{1*/ +/*FUNCTION GaussTria::GaussFromCoords{{{*/ void GaussTria::GaussFromCoords(double x,double y,double* xyz_list){ @@ -225,5 +225,5 @@ } /*}}}*/ -/*FUNCTION GaussTria::GaussVertex{{{1*/ +/*FUNCTION GaussTria::GaussVertex{{{*/ void GaussTria::GaussVertex(int iv){ @@ -249,5 +249,5 @@ } /*}}}*/ -/*FUNCTION GaussTria::begin{{{1*/ +/*FUNCTION GaussTria::begin{{{*/ int GaussTria::begin(void){ @@ -263,5 +263,5 @@ } /*}}}*/ -/*FUNCTION GaussTria::end{{{1*/ +/*FUNCTION GaussTria::end{{{*/ int GaussTria::end(void){ Index: /issm/trunk-jpl/src/c/objects/Gauss/GaussTria.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Gauss/GaussTria.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Gauss/GaussTria.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./../../shared/shared.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Hook.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Hook.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Hook.cpp (revision 12365) @@ -20,5 +20,5 @@ /*Constructor/Destructors*/ -/*FUNCTION Hook::Hook(){{{1*/ +/*FUNCTION Hook::Hook(){{{*/ Hook::Hook(){ this->num=0; @@ -29,5 +29,5 @@ } /*}}}*/ -/*FUNCTION Hook::Hook(int* ids, int num){{{1*/ +/*FUNCTION Hook::Hook(int* ids, int num){{{*/ Hook::Hook(int* in_ids, int in_num){ @@ -60,5 +60,5 @@ } /*}}}*/ -/*FUNCTION Hook::~Hook(){{{1*/ +/*FUNCTION Hook::~Hook(){{{*/ Hook::~Hook(){ /*deallocate: */ @@ -71,5 +71,5 @@ /*Some of the Object functionality: */ -/*FUNCTION Hook::Echo{{{1*/ +/*FUNCTION Hook::Echo{{{*/ void Hook::Echo(void){ @@ -90,5 +90,5 @@ } /*}}}*/ -/*FUNCTION Hook::DeepEcho{{{1*/ +/*FUNCTION Hook::DeepEcho{{{*/ void Hook::DeepEcho(void){ @@ -118,5 +118,5 @@ } /*}}}*/ -/*FUNCTION Hook::copy {{{1*/ +/*FUNCTION Hook::copy {{{*/ Object* Hook::copy(void){ @@ -148,5 +148,5 @@ /*Hook management: */ -/*FUNCTION Hook::configure{{{1*/ +/*FUNCTION Hook::configure{{{*/ void Hook::configure(DataSet* dataset){ @@ -190,5 +190,5 @@ } /*}}}*/ -/*FUNCTION Hook::delivers{{{1*/ +/*FUNCTION Hook::delivers{{{*/ Object* Hook::delivers(void){ @@ -203,30 +203,30 @@ /*}}}*/ -/*FUNCTION Hook::deliverp{{{1*/ +/*FUNCTION Hook::deliverp{{{*/ Object** Hook::deliverp(void){ return objects; } /*}}}*/ -/*FUNCTION Hook::Ids{{{1*/ +/*FUNCTION Hook::Ids{{{*/ int* Hook::Ids(void){ return this->ids; } /*}}}*/ -/*FUNCTION Hook::GetNum{{{1*/ +/*FUNCTION Hook::GetNum{{{*/ int Hook::GetNum(void){ return this->num; } /*}}}*/ -/*FUNCTION Hook::GetObjects{{{1*/ +/*FUNCTION Hook::GetObjects{{{*/ Object** Hook::GetObjects(void){ return this->objects; } /*}}}*/ -/*FUNCTION Hook::GetOffsets{{{1*/ +/*FUNCTION Hook::GetOffsets{{{*/ int* Hook::GetOffsets(void){ return this->offsets; } /*}}}*/ -/*FUNCTION Hook::Spawn{{{1*/ +/*FUNCTION Hook::Spawn{{{*/ Hook* Hook::Spawn(int* indices, int numindices){ Index: /issm/trunk-jpl/src/c/objects/Hook.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Hook.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Hook.h (revision 12365) @@ -10,5 +10,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Object.h" class DataSet; @@ -31,10 +31,10 @@ ~Hook(); /*}}}*/ - /*Object like functionality:{{{1*/ + /*Object like functionality:{{{*/ void Echo(void); void DeepEcho(void); Object* copy(void); /*}}}*/ - /*Hook management: {{{1*/ + /*Hook management: {{{*/ Object* delivers(void); //single object deliver Object** deliverp(void); //deliver all objects Index: /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.cpp (revision 12365) @@ -18,10 +18,10 @@ /*BoolInput constructors and destructor*/ -/*FUNCTION BoolInput::BoolInput(){{{1*/ +/*FUNCTION BoolInput::BoolInput(){{{*/ BoolInput::BoolInput(){ return; } /*}}}*/ -/*FUNCTION BoolInput::BoolInput(double* values){{{1*/ +/*FUNCTION BoolInput::BoolInput(double* values){{{*/ BoolInput::BoolInput(int in_enum_type,IssmBool in_value){ @@ -30,5 +30,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::~BoolInput(){{{1*/ +/*FUNCTION BoolInput::~BoolInput(){{{*/ BoolInput::~BoolInput(){ return; @@ -37,10 +37,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION BoolInput::Echo {{{1*/ +/*FUNCTION BoolInput::Echo {{{*/ void BoolInput::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION BoolInput::DeepEcho{{{1*/ +/*FUNCTION BoolInput::DeepEcho{{{*/ void BoolInput::DeepEcho(void){ @@ -50,8 +50,8 @@ } /*}}}*/ -/*FUNCTION BoolInput::Id{{{1*/ +/*FUNCTION BoolInput::Id{{{*/ int BoolInput::Id(void){ return -1; } /*}}}*/ -/*FUNCTION BoolInput::MyRank{{{1*/ +/*FUNCTION BoolInput::MyRank{{{*/ int BoolInput::MyRank(void){ extern int my_rank; @@ -59,5 +59,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::ObjectEnum{{{1*/ +/*FUNCTION BoolInput::ObjectEnum{{{*/ int BoolInput::ObjectEnum(void){ @@ -66,5 +66,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::copy{{{1*/ +/*FUNCTION BoolInput::copy{{{*/ Object* BoolInput::copy() { @@ -75,5 +75,5 @@ /*BoolInput management*/ -/*FUNCTION BoolInput::InstanceEnum{{{1*/ +/*FUNCTION BoolInput::InstanceEnum{{{*/ int BoolInput::InstanceEnum(void){ @@ -82,5 +82,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::SpawnTriaInput{{{1*/ +/*FUNCTION BoolInput::SpawnTriaInput{{{*/ Input* BoolInput::SpawnTriaInput(int* indices){ @@ -97,5 +97,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::SpawnResult{{{1*/ +/*FUNCTION BoolInput::SpawnResult{{{*/ ElementResult* BoolInput::SpawnResult(int step, double time){ @@ -106,33 +106,33 @@ /*Object functions*/ -/*FUNCTION BoolInput::GetInputValue(bool* pvalue) {{{1*/ +/*FUNCTION BoolInput::GetInputValue(bool* pvalue) {{{*/ void BoolInput::GetInputValue(bool* pvalue){ *pvalue=value; } /*}}}*/ -/*FUNCTION BoolInput::GetInputValue(int* pvalue){{{1*/ +/*FUNCTION BoolInput::GetInputValue(int* pvalue){{{*/ void BoolInput::GetInputValue(int* pvalue){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION BoolInput::GetInputValue(double* pvalue){{{1*/ +/*FUNCTION BoolInput::GetInputValue(double* pvalue){{{*/ void BoolInput::GetInputValue(double* pvalue){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION BoolInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/ +/*FUNCTION BoolInput::GetInputValue(double* pvalue,GaussTria* gauss){{{*/ void BoolInput::GetInputValue(double* pvalue,GaussTria* gauss){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION BoolInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/ +/*FUNCTION BoolInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{*/ void BoolInput::GetInputValue(double* pvalue,GaussPenta* gauss){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/ +/*FUNCTION BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{*/ void BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/ +/*FUNCTION BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{*/ void BoolInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION BoolInput::ChangeEnum{{{1*/ +/*FUNCTION BoolInput::ChangeEnum{{{*/ void BoolInput::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION BoolInput::SquareMin{{{1*/ +/*FUNCTION BoolInput::SquareMin{{{*/ void BoolInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ /*square of a bool is the bool itself: */ @@ -140,10 +140,10 @@ } /*}}}*/ -/*FUNCTION BoolInput::Scale{{{1*/ +/*FUNCTION BoolInput::Scale{{{*/ void BoolInput::Scale(double scale_factor){ /*a bool cannot be scaled: */ } /*}}}*/ -/*FUNCTION BoolInput::AXPY{{{1*/ +/*FUNCTION BoolInput::AXPY{{{*/ void BoolInput::AXPY(Input* xinput,double scalar){ @@ -166,5 +166,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::Constrain{{{1*/ +/*FUNCTION BoolInput::Constrain{{{*/ void BoolInput::Constrain(double cm_min, double cm_max){ @@ -174,5 +174,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::Extrude{{{1*/ +/*FUNCTION BoolInput::Extrude{{{*/ void BoolInput::Extrude(void){ @@ -181,5 +181,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::GetVectorFromInputs{{{1*/ +/*FUNCTION BoolInput::GetVectorFromInputs{{{*/ void BoolInput::GetVectorFromInputs(Vector* vector,int* doflist){ @@ -188,5 +188,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::GetValuesPtr{{{1*/ +/*FUNCTION BoolInput::GetValuesPtr{{{*/ void BoolInput::GetValuesPtr(double** pvalues,int* pnum_values){ @@ -195,5 +195,5 @@ } /*}}}*/ -/*FUNCTION BoolInput::Configure{{{1*/ +/*FUNCTION BoolInput::Configure{{{*/ void BoolInput::Configure(Parameters* parameters){ /*do nothing: */ Index: /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/BoolInput.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Input.h" #include "../../include/include.h" @@ -21,10 +21,10 @@ IssmBool value; - /*BoolInput constructors, destructors: {{{1*/ + /*BoolInput constructors, destructors: {{{*/ BoolInput(); BoolInput(int enum_type,IssmBool value); ~BoolInput(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -34,5 +34,5 @@ Object* copy(); /*}}}*/ - /*BoolInput management: {{{1*/ + /*BoolInput management: {{{*/ int InstanceEnum(); Input* SpawnTriaInput(int* indices); @@ -44,5 +44,5 @@ void AddTimeValues(double* values,int step,double time){_error_("not supported yet");}; /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void GetInputValue(bool* pvalue); void GetInputValue(int* pvalue); Index: /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp (revision 12365) @@ -18,5 +18,5 @@ /*ControlInput constructors and destructor*/ -/*FUNCTION ControlInput::ControlInput(){{{1*/ +/*FUNCTION ControlInput::ControlInput(){{{*/ ControlInput::ControlInput(){ control_id = 0; @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION ControlInput::ControlInput(int enum_type,int enum_input,double* pvalues,double* pmin,double* pmax,int id){{{1*/ +/*FUNCTION ControlInput::ControlInput(int enum_type,int enum_input,double* pvalues,double* pmin,double* pmax,int id){{{*/ ControlInput::ControlInput(int in_enum_type,int enum_input,double* pvalues,double* pmin,double* pmax,int id){ @@ -53,5 +53,5 @@ } /*}}}*/ -/*FUNCTION ControlInput::~ControlInput(){{{1*/ +/*FUNCTION ControlInput::~ControlInput(){{{*/ ControlInput::~ControlInput(){ delete values; @@ -64,10 +64,10 @@ /*Object virtual functions definitions:*/ - /*FUNCTION ControlInput::Echo {{{1*/ + /*FUNCTION ControlInput::Echo {{{*/ void ControlInput::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION ControlInput::DeepEcho{{{1*/ +/*FUNCTION ControlInput::DeepEcho{{{*/ void ControlInput::DeepEcho(void){ @@ -81,8 +81,8 @@ } /*}}}*/ -/*FUNCTION ControlInput::Id{{{1*/ +/*FUNCTION ControlInput::Id{{{*/ int ControlInput::Id(void){ return -1; } /*}}}*/ -/*FUNCTION ControlInput::MyRank{{{1*/ +/*FUNCTION ControlInput::MyRank{{{*/ int ControlInput::MyRank(void){ extern int my_rank; @@ -90,5 +90,5 @@ } /*}}}*/ -/*FUNCTION ControlInput::ObjectEnum{{{1*/ +/*FUNCTION ControlInput::ObjectEnum{{{*/ int ControlInput::ObjectEnum(void){ @@ -97,5 +97,5 @@ } /*}}}*/ -/*FUNCTION ControlInput::copy{{{1*/ +/*FUNCTION ControlInput::copy{{{*/ Object* ControlInput::copy() { @@ -117,5 +117,5 @@ /*ControlInput management*/ -/*FUNCTION ControlInput::InstanceEnum{{{1*/ +/*FUNCTION ControlInput::InstanceEnum{{{*/ int ControlInput::InstanceEnum(void){ @@ -126,5 +126,5 @@ /*Object functions*/ -/*FUNCTION ControlInput::Constrain(){{{1*/ +/*FUNCTION ControlInput::Constrain(){{{*/ void ControlInput::Constrain(void){ @@ -136,9 +136,9 @@ delete values; this->values=newvalues; }/*}}}*/ -/*FUNCTION ControlInput::Constrain(double min, double max){{{1*/ +/*FUNCTION ControlInput::Constrain(double min, double max){{{*/ void ControlInput::Constrain(double min, double max){ values->Constrain(min,max); }/*}}}*/ -/*FUNCTION ControlInput::Extrude{{{1*/ +/*FUNCTION ControlInput::Extrude{{{*/ void ControlInput::Extrude(void){ values->Extrude(); @@ -146,14 +146,14 @@ //gradient->Extrude(); }/*}}}*/ -/*FUNCTION ControlInput::GetGradient{{{1*/ +/*FUNCTION ControlInput::GetGradient{{{*/ void ControlInput::GetGradient(Vector* gradient_vec,int* doflist){ if(gradient) gradient->GetVectorFromInputs(gradient_vec,doflist); }/*}}}*/ -/*FUNCTION ControlInput::ScaleGradient{{{1*/ +/*FUNCTION ControlInput::ScaleGradient{{{*/ void ControlInput::ScaleGradient(double scaling_factor){ if(!gradient) _error_("Gradient of ControlInput %s not found",EnumToStringx(enum_type)); gradient->Scale(scaling_factor); }/*}}}*/ -/*FUNCTION ControlInput::SetGradient{{{1*/ +/*FUNCTION ControlInput::SetGradient{{{*/ void ControlInput::SetGradient(Input* gradient_in){ @@ -178,5 +178,5 @@ }/*}}}*/ -/*FUNCTION ControlInput::SetInput{{{1*/ +/*FUNCTION ControlInput::SetInput{{{*/ void ControlInput::SetInput(Input* in_input){ @@ -185,22 +185,22 @@ }/*}}}*/ -/*FUNCTION ControlInput::SpawnResult{{{1*/ +/*FUNCTION ControlInput::SpawnResult{{{*/ ElementResult* ControlInput::SpawnResult(int step, double time){ return savedvalues->SpawnResult(step,time); }/*}}}*/ -/*FUNCTION ControlInput::SpawnTriaInput{{{1*/ +/*FUNCTION ControlInput::SpawnTriaInput{{{*/ Input* ControlInput::SpawnTriaInput(int* indices){ return values->SpawnTriaInput(indices); }/*}}}*/ -/*FUNCTION ControlInput::SpawnGradient{{{1*/ +/*FUNCTION ControlInput::SpawnGradient{{{*/ ElementResult* ControlInput::SpawnGradient(int step, double time){ _assert_(gradient); return gradient->SpawnResult(step,time); }/*}}}*/ -/*FUNCTION ControlInput::GetVectorFromInputs(Vector* vector,int* doflist){{{1*/ +/*FUNCTION ControlInput::GetVectorFromInputs(Vector* vector,int* doflist){{{*/ void ControlInput::GetVectorFromInputs(Vector* vector,int* doflist){ values->GetVectorFromInputs(vector,doflist); }/*}}}*/ -/*FUNCTION ControlInput::GetVectorFromInputs(Vector* vector,int* doflist,const char* data){{{1*/ +/*FUNCTION ControlInput::GetVectorFromInputs(Vector* vector,int* doflist,const char* data){{{*/ void ControlInput::GetVectorFromInputs(Vector* vector,int* doflist,const char* data){ if(strcmp(data,"value")==0){ @@ -224,37 +224,37 @@ } }/*}}}*/ -/*FUNCTION ControlInput::GetInputAverage(double* pvalue){{{1*/ +/*FUNCTION ControlInput::GetInputAverage(double* pvalue){{{*/ void ControlInput::GetInputAverage(double* pvalue){ values->GetInputAverage(pvalue); }/*}}}*/ -/*FUNCTION ControlInput::GetInputValue(bool* pvalue){{{1*/ +/*FUNCTION ControlInput::GetInputValue(bool* pvalue){{{*/ void ControlInput::GetInputValue(bool* pvalue){ values->GetInputValue(pvalue); }/*}}}*/ -/*FUNCTION ControlInput::GetInputValue(int* pvalue){{{1*/ +/*FUNCTION ControlInput::GetInputValue(int* pvalue){{{*/ void ControlInput::GetInputValue(int* pvalue){ values->GetInputValue(pvalue); }/*}}}*/ -/*FUNCTION ControlInput::GetInputValue(double* pvalue){{{1*/ +/*FUNCTION ControlInput::GetInputValue(double* pvalue){{{*/ void ControlInput::GetInputValue(double* pvalue){ values->GetInputValue(pvalue); }/*}}}*/ -/*FUNCTION ControlInput::GetInputValue(double* pvalue){{{1*/ +/*FUNCTION ControlInput::GetInputValue(double* pvalue){{{*/ void ControlInput::GetInputValue(double* pvalue,GaussTria* gauss){ values->GetInputValue(pvalue,gauss); }/*}}}*/ -/*FUNCTION ControlInput::GetInputValue(double* pvalue){{{1*/ +/*FUNCTION ControlInput::GetInputValue(double* pvalue){{{*/ void ControlInput::GetInputValue(double* pvalue,GaussPenta* gauss){ values->GetInputValue(pvalue,gauss); }/*}}}*/ -/*FUNCTION ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/ +/*FUNCTION ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{*/ void ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){ values->GetInputDerivativeValue(derivativevalues,xyz_list,gauss); }/*}}}*/ -/*FUNCTION ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/ +/*FUNCTION ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{*/ void ControlInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){ values->GetInputDerivativeValue(derivativevalues,xyz_list,gauss); }/*}}}*/ -/*FUNCTION ControlInput::SaveValue{{{1*/ +/*FUNCTION ControlInput::SaveValue{{{*/ void ControlInput::SaveValue(void){ if(!values) _error_("Values of %s not found",EnumToStringx(this->enum_type)); @@ -263,5 +263,5 @@ this->savedvalues=(Input*)this->values->copy(); }/*}}}*/ -/*FUNCTION ControlInput::UpdateValue{{{1*/ +/*FUNCTION ControlInput::UpdateValue{{{*/ void ControlInput::UpdateValue(double scalar){ if(!gradient) _error_("Gradient of %s not found",EnumToStringx(this->enum_type)); @@ -272,9 +272,9 @@ this->values->AXPY(gradient,scalar); }/*}}}*/ -/*FUNCTION ControlInput::VerticallyIntegrate{{{1*/ +/*FUNCTION ControlInput::VerticallyIntegrate{{{*/ void ControlInput::VerticallyIntegrate(Input* thickness_input){ values->VerticallyIntegrate(thickness_input); }/*}}}*/ -/*FUNCTION ControlInput::Configure{{{1*/ +/*FUNCTION ControlInput::Configure{{{*/ void ControlInput::Configure(Parameters* parameters){ /*do nothing: */ Index: /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/ControlInput.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Input.h" #include "../../include/include.h" @@ -25,10 +25,10 @@ Input* gradient; - /*ControlInput constructors, destructors: {{{1*/ + /*ControlInput constructors, destructors: {{{*/ ControlInput(); ControlInput(int enum_type,int enum_input,double* pvalues,double* pmin,double* pmax,int id); ~ControlInput(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -38,5 +38,5 @@ Object* copy(); /*}}}*/ - /*ControlInput management: {{{1*/ + /*ControlInput management: {{{*/ int InstanceEnum(); Input* SpawnTriaInput(int* indices); @@ -48,5 +48,5 @@ void Configure(Parameters* parameters); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void SetInput(Input* in_input); void GetInputValue(bool* pvalue); Index: /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.cpp (revision 12365) @@ -2,5 +2,5 @@ * \brief: implementation of the datasetinput object */ -/*Headers{{{1*/ +/*Headers{{{*/ #ifdef HAVE_CONFIG_H #include @@ -19,5 +19,5 @@ /*DatasetInput constructors and destructor*/ -/*FUNCTION DatasetInput::DatasetInput(){{{1*/ +/*FUNCTION DatasetInput::DatasetInput(){{{*/ DatasetInput::DatasetInput(){ enum_type=UNDEF; @@ -25,5 +25,5 @@ } /*}}}*/ -/*FUNCTION DatasetInput::DatasetInput(int in_enum_type) {{{1*/ +/*FUNCTION DatasetInput::DatasetInput(int in_enum_type) {{{*/ DatasetInput::DatasetInput(int in_enum_type){ @@ -32,5 +32,5 @@ } /*}}}*/ -/*FUNCTION DatasetInput::~DatasetInput(){{{1*/ +/*FUNCTION DatasetInput::~DatasetInput(){{{*/ DatasetInput::~DatasetInput(){ delete inputs; @@ -39,10 +39,10 @@ /*Object virtual functions definitions:*/ - /*FUNCTION DatasetInput::Echo {{{1*/ + /*FUNCTION DatasetInput::Echo {{{*/ void DatasetInput::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION DatasetInput::DeepEcho{{{1*/ +/*FUNCTION DatasetInput::DeepEcho{{{*/ void DatasetInput::DeepEcho(void){ @@ -52,8 +52,8 @@ } /*}}}*/ -/*FUNCTION DatasetInput::Id{{{1*/ +/*FUNCTION DatasetInput::Id{{{*/ int DatasetInput::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DatasetInput::MyRank{{{1*/ +/*FUNCTION DatasetInput::MyRank{{{*/ int DatasetInput::MyRank(void){ extern int my_rank; @@ -61,5 +61,5 @@ } /*}}}*/ -/*FUNCTION DatasetInput::ObjectEnum{{{1*/ +/*FUNCTION DatasetInput::ObjectEnum{{{*/ int DatasetInput::ObjectEnum(void){ @@ -68,5 +68,5 @@ } /*}}}*/ -/*FUNCTION DatasetInput::copy{{{1*/ +/*FUNCTION DatasetInput::copy{{{*/ Object* DatasetInput::copy() { @@ -80,5 +80,5 @@ } /*}}}*/ -/*FUNCTION DatasetInput::SpawnTriaInput{{{1*/ +/*FUNCTION DatasetInput::SpawnTriaInput{{{*/ Input* DatasetInput::SpawnTriaInput(int* indices){ @@ -97,5 +97,5 @@ /*DatasetInput management*/ -/*FUNCTION DatasetInput::InstanceEnum{{{1*/ +/*FUNCTION DatasetInput::InstanceEnum{{{*/ int DatasetInput::InstanceEnum(void){ @@ -106,10 +106,10 @@ /*Object functions*/ -/*FUNCTION DatasetInput::Configure{{{1*/ +/*FUNCTION DatasetInput::Configure{{{*/ void DatasetInput::Configure(Parameters* parameters){ /*do nothing: */ } /*}}}*/ -/*FUNCTION DatasetInput::GetInputValue(double* pvalue,GaussTria* gauss,int index){{{1*/ +/*FUNCTION DatasetInput::GetInputValue(double* pvalue,GaussTria* gauss,int index){{{*/ void DatasetInput::GetInputValue(double* pvalue,GaussTria* gauss,int index){ Index: /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/DatasetInput.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Input.h" #include "../../include/include.h" @@ -21,10 +21,10 @@ Inputs* inputs; - /*DatasetInput constructors, destructors: {{{1*/ + /*DatasetInput constructors, destructors: {{{*/ DatasetInput(); DatasetInput(int enum_type); ~DatasetInput(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -34,5 +34,5 @@ Object* copy(); /*}}}*/ - /*DatasetInput management: {{{1*/ + /*DatasetInput management: {{{*/ int InstanceEnum(); Input* SpawnTriaInput(int* indices); @@ -44,5 +44,5 @@ void Configure(Parameters* parameters); /*}}}*/ - /*numeriics: {{{1*/ + /*numeriics: {{{*/ void GetInputValue(bool* pvalue){_error_("not implemented yet");}; void GetInputValue(int* pvalue){_error_("not implemented yet");}; Index: /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.cpp (revision 12365) @@ -18,10 +18,10 @@ /*DoubleInput constructors and destructor*/ -/*FUNCTION DoubleInput::DoubleInput(){{{1*/ +/*FUNCTION DoubleInput::DoubleInput(){{{*/ DoubleInput::DoubleInput(){ return; } /*}}}*/ -/*FUNCTION DoubleInput::DoubleInput(double value){{{1*/ +/*FUNCTION DoubleInput::DoubleInput(double value){{{*/ DoubleInput::DoubleInput(int in_enum_type,IssmDouble in_value){ @@ -30,5 +30,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::~DoubleInput(){{{1*/ +/*FUNCTION DoubleInput::~DoubleInput(){{{*/ DoubleInput::~DoubleInput(){ return; @@ -37,10 +37,10 @@ /*Object virtual functions definitions:*/ - /*FUNCTION DoubleInput::Echo {{{1*/ + /*FUNCTION DoubleInput::Echo {{{*/ void DoubleInput::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION DoubleInput::DeepEcho{{{1*/ +/*FUNCTION DoubleInput::DeepEcho{{{*/ void DoubleInput::DeepEcho(void){ @@ -50,8 +50,8 @@ } /*}}}*/ -/*FUNCTION DoubleInput::Id{{{1*/ +/*FUNCTION DoubleInput::Id{{{*/ int DoubleInput::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleInput::MyRank{{{1*/ +/*FUNCTION DoubleInput::MyRank{{{*/ int DoubleInput::MyRank(void){ extern int my_rank; @@ -59,5 +59,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::ObjectEnum{{{1*/ +/*FUNCTION DoubleInput::ObjectEnum{{{*/ int DoubleInput::ObjectEnum(void){ @@ -66,5 +66,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::copy{{{1*/ +/*FUNCTION DoubleInput::copy{{{*/ Object* DoubleInput::copy() { @@ -75,5 +75,5 @@ /*DoubleInput management*/ -/*FUNCTION DoubleInput::InstanceEnum{{{1*/ +/*FUNCTION DoubleInput::InstanceEnum{{{*/ int DoubleInput::InstanceEnum(void){ @@ -82,5 +82,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::SpawnTriaInput{{{1*/ +/*FUNCTION DoubleInput::SpawnTriaInput{{{*/ Input* DoubleInput::SpawnTriaInput(int* indices){ @@ -97,5 +97,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::SpawnResult{{{1*/ +/*FUNCTION DoubleInput::SpawnResult{{{*/ ElementResult* DoubleInput::SpawnResult(int step, double time){ @@ -106,5 +106,5 @@ /*Object functions*/ -/*FUNCTION DoubleInput::GetInputValue(bool* pvalue) {{{1*/ +/*FUNCTION DoubleInput::GetInputValue(bool* pvalue) {{{*/ void DoubleInput::GetInputValue(bool* pvalue){ _error_("Double input of enum %s cannot return a boolean",EnumToStringx(enum_type)); @@ -112,5 +112,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetInputValue(int* pvalue){{{1*/ +/*FUNCTION DoubleInput::GetInputValue(int* pvalue){{{*/ void DoubleInput::GetInputValue(int* pvalue){ _error_("Double input of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type)); @@ -118,5 +118,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetInputValue(double* pvalue){{{1*/ +/*FUNCTION DoubleInput::GetInputValue(double* pvalue){{{*/ void DoubleInput::GetInputValue(double* pvalue){ @@ -125,17 +125,17 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/ +/*FUNCTION DoubleInput::GetInputValue(double* pvalue,GaussTria* gauss){{{*/ void DoubleInput::GetInputValue(double* pvalue,GaussTria* gauss){*pvalue=this->value;} /*}}}*/ -/*FUNCTION DoubleInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/ +/*FUNCTION DoubleInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{*/ void DoubleInput::GetInputValue(double* pvalue,GaussPenta* gauss){*pvalue=this->value;} /*}}}*/ -/*FUNCTION DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/ +/*FUNCTION DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{*/ void DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/ +/*FUNCTION DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{*/ void DoubleInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION DoubleInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){{{1*/ +/*FUNCTION DoubleInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){{{*/ void DoubleInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ /*Epsilon is zero as vx is constant over the element*/ @@ -143,5 +143,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){{{1*/ +/*FUNCTION DoubleInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){{{*/ void DoubleInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ /*Epsilon is zero as vy is constant over the element*/ @@ -149,5 +149,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){{{1*/ +/*FUNCTION DoubleInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){{{*/ void DoubleInput::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){ /*Epsilon is zero as vx is constant over the element*/ @@ -155,5 +155,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){{{1*/ +/*FUNCTION DoubleInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){{{*/ void DoubleInput::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){ /*Epsilon is zero as vy is constant over the element*/ @@ -161,5 +161,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){{{1*/ +/*FUNCTION DoubleInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){{{*/ void DoubleInput::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){ /*Epsilon is zero as vz is constant over the element*/ @@ -167,5 +167,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){{{1*/ +/*FUNCTION DoubleInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){{{*/ void DoubleInput::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){ /*Epsilon is zero as vx is constant over the element*/ @@ -173,5 +173,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){{{1*/ +/*FUNCTION DoubleInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){{{*/ void DoubleInput::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){ /*Epsilon is zero as vy is constant over the element*/ @@ -179,10 +179,10 @@ } /*}}}*/ -/*FUNCTION DoubleInput::ChangeEnum{{{1*/ +/*FUNCTION DoubleInput::ChangeEnum{{{*/ void DoubleInput::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION DoubleInput::SquareMin{{{1*/ +/*FUNCTION DoubleInput::SquareMin{{{*/ void DoubleInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ @@ -191,15 +191,15 @@ } /*}}}*/ -/*FUNCTION DoubleInput::Scale{{{1*/ +/*FUNCTION DoubleInput::Scale{{{*/ void DoubleInput::Scale(double scale_factor){ value=value*scale_factor; } /*}}}*/ -/*FUNCTION DoubleInput::ConstrainMin{{{1*/ +/*FUNCTION DoubleInput::ConstrainMin{{{*/ void DoubleInput::ConstrainMin(double minimum){ if (valuevalue; } /*}}}*/ -/*FUNCTION DoubleInput::MaxAbs{{{1*/ +/*FUNCTION DoubleInput::MaxAbs{{{*/ double DoubleInput::MaxAbs(void){ return fabs(this->value); } /*}}}*/ -/*FUNCTION DoubleInput::Min{{{1*/ +/*FUNCTION DoubleInput::Min{{{*/ double DoubleInput::Min(void){ return this->value; } /*}}}*/ -/*FUNCTION DoubleInput::MinAbs{{{1*/ +/*FUNCTION DoubleInput::MinAbs{{{*/ double DoubleInput::MinAbs(void){ return fabs(this->value); } /*}}}*/ -/*FUNCTION DoubleInput::GetVectorFromInputs{{{1*/ +/*FUNCTION DoubleInput::GetVectorFromInputs{{{*/ void DoubleInput::GetVectorFromInputs(Vector* vector,int* doflist){ @@ -257,5 +257,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetValuesPtr{{{1*/ +/*FUNCTION DoubleInput::GetValuesPtr{{{*/ void DoubleInput::GetValuesPtr(double** pvalues,int* pnum_values){ @@ -264,10 +264,10 @@ } /*}}}*/ -/*FUNCTION DoubleInput::GetInputAverage{{{1*/ +/*FUNCTION DoubleInput::GetInputAverage{{{*/ void DoubleInput::GetInputAverage(double* pvalue){ *pvalue=value; } /*}}}*/ -/*FUNCTION DoubleInput::VerticallyIntegrate{{{1*/ +/*FUNCTION DoubleInput::VerticallyIntegrate{{{*/ void DoubleInput::VerticallyIntegrate(Input* thickness_input){ @@ -291,5 +291,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::PointwiseDivide{{{1*/ +/*FUNCTION DoubleInput::PointwiseDivide{{{*/ Input* DoubleInput::PointwiseDivide(Input* inputB){ @@ -311,5 +311,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::PointwiseMin{{{1*/ +/*FUNCTION DoubleInput::PointwiseMin{{{*/ Input* DoubleInput::PointwiseMin(Input* input){ @@ -332,5 +332,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::PointwiseMax{{{1*/ +/*FUNCTION DoubleInput::PointwiseMax{{{*/ Input* DoubleInput::PointwiseMax(Input* input){ @@ -353,5 +353,5 @@ } /*}}}*/ -/*FUNCTION DoubleInput::Configure{{{1*/ +/*FUNCTION DoubleInput::Configure{{{*/ void DoubleInput::Configure(Parameters* parameters){ /*do nothing: */ Index: /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/DoubleInput.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Input.h" #include "../../include/include.h" @@ -20,10 +20,10 @@ double value; - /*DoubleInput constructors, destructors: {{{1*/ + /*DoubleInput constructors, destructors: {{{*/ DoubleInput(); DoubleInput(int enum_type,IssmDouble value); ~DoubleInput(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -33,5 +33,5 @@ Object* copy(); /*}}}*/ - /*DoubleInput management: {{{1*/ + /*DoubleInput management: {{{*/ int InstanceEnum(); Input* SpawnTriaInput(int* indices); @@ -43,5 +43,5 @@ void Configure(Parameters* parameters); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void GetInputValue(bool* pvalue); void GetInputValue(int* pvalue); Index: /issm/trunk-jpl/src/c/objects/Inputs/Input.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/Input.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/Input.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Object.h" class Node; @@ -21,5 +21,5 @@ virtual ~Input(){}; - /*Virtual functions:{{{1*/ + /*Virtual functions:{{{*/ virtual int InstanceEnum()=0; virtual void GetInputValue(bool* pvalue)=0; Index: /issm/trunk-jpl/src/c/objects/Inputs/IntInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/IntInput.cpp (revision 12365) @@ -18,10 +18,10 @@ /*IntInput constructors and destructor*/ -/*FUNCTION IntInput::IntInput(){{{1*/ +/*FUNCTION IntInput::IntInput(){{{*/ IntInput::IntInput(){ return; } /*}}}*/ -/*FUNCTION IntInput::IntInput(double* values){{{1*/ +/*FUNCTION IntInput::IntInput(double* values){{{*/ IntInput::IntInput(int in_enum_type,IssmInt in_value){ @@ -30,5 +30,5 @@ } /*}}}*/ -/*FUNCTION IntInput::~IntInput(){{{1*/ +/*FUNCTION IntInput::~IntInput(){{{*/ IntInput::~IntInput(){ return; @@ -37,5 +37,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION IntInput::DeepEcho{{{1*/ +/*FUNCTION IntInput::DeepEcho{{{*/ void IntInput::DeepEcho(void){ @@ -45,8 +45,8 @@ } /*}}}*/ -/*FUNCTION IntInput::Id{{{1*/ +/*FUNCTION IntInput::Id{{{*/ int IntInput::Id(void){ return -1; } /*}}}*/ -/*FUNCTION IntInput::MyRank{{{1*/ +/*FUNCTION IntInput::MyRank{{{*/ int IntInput::MyRank(void){ extern int my_rank; @@ -54,5 +54,5 @@ } /*}}}*/ -/*FUNCTION IntInput::ObjectEnum{{{1*/ +/*FUNCTION IntInput::ObjectEnum{{{*/ int IntInput::ObjectEnum(void){ @@ -61,5 +61,5 @@ } /*}}}*/ -/*FUNCTION IntInput::copy{{{1*/ +/*FUNCTION IntInput::copy{{{*/ Object* IntInput::copy() { @@ -70,10 +70,10 @@ /*IntInput management*/ -/*FUNCTION IntInput::Echo {{{1*/ +/*FUNCTION IntInput::Echo {{{*/ void IntInput::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION IntInput::InstanceEnum{{{1*/ +/*FUNCTION IntInput::InstanceEnum{{{*/ int IntInput::InstanceEnum(void){ @@ -82,5 +82,5 @@ } /*}}}*/ -/*FUNCTION IntInput::SpawnTriaInput{{{1*/ +/*FUNCTION IntInput::SpawnTriaInput{{{*/ Input* IntInput::SpawnTriaInput(int* indices){ @@ -96,5 +96,5 @@ } /*}}}*/ -/*FUNCTION IntInput::SpawnResult{{{1*/ +/*FUNCTION IntInput::SpawnResult{{{*/ ElementResult* IntInput::SpawnResult(int step, double time){ @@ -105,35 +105,35 @@ /*Object functions*/ -/*FUNCTION IntInput::GetInputValue(bool* pvalue) {{{1*/ +/*FUNCTION IntInput::GetInputValue(bool* pvalue) {{{*/ void IntInput::GetInputValue(bool* pvalue){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION IntInput::GetInputValue(int* pvalue){{{1*/ +/*FUNCTION IntInput::GetInputValue(int* pvalue){{{*/ void IntInput::GetInputValue(int* pvalue){ *pvalue=value; } /*}}}*/ -/*FUNCTION IntInput::GetInputValue(double* pvalue){{{1*/ +/*FUNCTION IntInput::GetInputValue(double* pvalue){{{*/ void IntInput::GetInputValue(double* pvalue){ _error_("IntInput cannot return a double in parallel"); } /*}}}*/ -/*FUNCTION IntInput::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/ +/*FUNCTION IntInput::GetInputValue(double* pvalue,GaussTria* gauss){{{*/ void IntInput::GetInputValue(double* pvalue,GaussTria* gauss){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION IntInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/ +/*FUNCTION IntInput::GetInputValue(double* pvalue,GaussPenta* gauss){{{*/ void IntInput::GetInputValue(double* pvalue,GaussPenta* gauss){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{1*/ +/*FUNCTION IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){{{*/ void IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussTria* gauss){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{1*/ +/*FUNCTION IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){{{*/ void IntInput::GetInputDerivativeValue(double* derivativevalues, double* xyz_list, GaussPenta* gauss){_error_(" not supported yet!");} /*}}}*/ -/*FUNCTION IntInput::ChangeEnum{{{1*/ +/*FUNCTION IntInput::ChangeEnum{{{*/ void IntInput::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION IntInput::SquareMin{{{1*/ +/*FUNCTION IntInput::SquareMin{{{*/ void IntInput::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ @@ -142,5 +142,5 @@ } /*}}}*/ -/*FUNCTION IntInput::Scale{{{1*/ +/*FUNCTION IntInput::Scale{{{*/ void IntInput::Scale(double scale_factor){ double dvalue=(double)value*scale_factor; @@ -148,5 +148,5 @@ } /*}}}*/ -/*FUNCTION IntInput::AXPY{{{1*/ +/*FUNCTION IntInput::AXPY{{{*/ void IntInput::AXPY(Input* xinput,double scalar){ @@ -171,5 +171,5 @@ } /*}}}*/ -/*FUNCTION IntInput::Constrain{{{1*/ +/*FUNCTION IntInput::Constrain{{{*/ void IntInput::Constrain(double cm_min, double cm_max){ @@ -179,5 +179,5 @@ } /*}}}*/ -/*FUNCTION IntInput::GetVectorFromInputs{{{1*/ +/*FUNCTION IntInput::GetVectorFromInputs{{{*/ void IntInput::GetVectorFromInputs(Vector* vector,int* doflist){ @@ -186,5 +186,5 @@ } /*}}}*/ -/*FUNCTION IntInput::GetValuesPtr{{{1*/ +/*FUNCTION IntInput::GetValuesPtr{{{*/ void IntInput::GetValuesPtr(double** pvalues,int* pnum_values){ @@ -193,5 +193,5 @@ } /*}}}*/ -/*FUNCTION IntInput::Configure{{{1*/ +/*FUNCTION IntInput::Configure{{{*/ void IntInput::Configure(Parameters* parameters){ /*do nothing: */ Index: /issm/trunk-jpl/src/c/objects/Inputs/IntInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/IntInput.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/IntInput.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Input.h" #include "../../include/include.h" @@ -21,10 +21,10 @@ IssmInt value; - /*IntInput constructors, destructors: {{{1*/ + /*IntInput constructors, destructors: {{{*/ IntInput(); IntInput(int enum_type,IssmInt value); ~IntInput(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -34,5 +34,5 @@ Object* copy(); /*}}}*/ - /*IntInput management: {{{1*/ + /*IntInput management: {{{*/ int InstanceEnum(); Input* SpawnTriaInput(int* indices); @@ -44,5 +44,5 @@ void Configure(Parameters* parameters); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void GetInputValue(bool* pvalue); void GetInputValue(int* pvalue); Index: /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.cpp (revision 12365) @@ -18,10 +18,10 @@ /*PentaP1Input constructors and destructor*/ -/*FUNCTION PentaP1Input::PentaP1Input(){{{1*/ +/*FUNCTION PentaP1Input::PentaP1Input(){{{*/ PentaP1Input::PentaP1Input(){ return; } /*}}}*/ -/*FUNCTION PentaP1Input::PentaP1Input(int in_enum_type,double* values){{{1*/ +/*FUNCTION PentaP1Input::PentaP1Input(int in_enum_type,double* values){{{*/ PentaP1Input::PentaP1Input(int in_enum_type,double* in_values) :PentaRef(1) @@ -41,5 +41,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::~PentaP1Input(){{{1*/ +/*FUNCTION PentaP1Input::~PentaP1Input(){{{*/ PentaP1Input::~PentaP1Input(){ return; @@ -48,10 +48,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION PentaP1Input::Echo {{{1*/ +/*FUNCTION PentaP1Input::Echo {{{*/ void PentaP1Input::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION PentaP1Input::DeepEcho{{{1*/ +/*FUNCTION PentaP1Input::DeepEcho{{{*/ void PentaP1Input::DeepEcho(void){ @@ -61,8 +61,8 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::Id{{{1*/ +/*FUNCTION PentaP1Input::Id{{{*/ int PentaP1Input::Id(void){ return -1; } /*}}}*/ -/*FUNCTION PentaP1Input::MyRank{{{1*/ +/*FUNCTION PentaP1Input::MyRank{{{*/ int PentaP1Input::MyRank(void){ extern int my_rank; @@ -70,5 +70,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::ObjectEnum{{{1*/ +/*FUNCTION PentaP1Input::ObjectEnum{{{*/ int PentaP1Input::ObjectEnum(void){ @@ -79,5 +79,5 @@ /*PentaP1Input management*/ -/*FUNCTION PentaP1Input::copy{{{1*/ +/*FUNCTION PentaP1Input::copy{{{*/ Object* PentaP1Input::copy() { @@ -86,5 +86,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::InstanceEnum{{{1*/ +/*FUNCTION PentaP1Input::InstanceEnum{{{*/ int PentaP1Input::InstanceEnum(void){ @@ -93,5 +93,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::SpawnTriaInput{{{1*/ +/*FUNCTION PentaP1Input::SpawnTriaInput{{{*/ Input* PentaP1Input::SpawnTriaInput(int* indices){ @@ -118,5 +118,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::SpawnResult{{{1*/ +/*FUNCTION PentaP1Input::SpawnResult{{{*/ ElementResult* PentaP1Input::SpawnResult(int step, double time){ @@ -127,5 +127,5 @@ /*Object functions*/ -/*FUNCTION PentaP1Input::GetInputValue(double* pvalue,GaussPenta* gauss){{{1*/ +/*FUNCTION PentaP1Input::GetInputValue(double* pvalue,GaussPenta* gauss){{{*/ void PentaP1Input::GetInputValue(double* pvalue,GaussPenta* gauss){ @@ -135,5 +135,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){{{1*/ +/*FUNCTION PentaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){{{*/ void PentaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussPenta* gauss){ @@ -142,5 +142,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::GetVxStrainRate3d{{{1*/ +/*FUNCTION PentaP1Input::GetVxStrainRate3d{{{*/ void PentaP1Input::GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussPenta* gauss){ int i,j; @@ -187,5 +187,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::GetVyStrainRate3d{{{1*/ +/*FUNCTION PentaP1Input::GetVyStrainRate3d{{{*/ void PentaP1Input::GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussPenta* gauss){ int i,j; @@ -232,5 +232,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::GetVzStrainRate3d{{{1*/ +/*FUNCTION PentaP1Input::GetVzStrainRate3d{{{*/ void PentaP1Input::GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussPenta* gauss){ int i,j; @@ -278,5 +278,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::GetVxStrainRate3dPattyn{{{1*/ +/*FUNCTION PentaP1Input::GetVxStrainRate3dPattyn{{{*/ void PentaP1Input::GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussPenta* gauss){ @@ -302,5 +302,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::GetVyStrainRate3dPattyn{{{1*/ +/*FUNCTION PentaP1Input::GetVyStrainRate3dPattyn{{{*/ void PentaP1Input::GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussPenta* gauss){ @@ -326,10 +326,10 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::ChangeEnum{{{1*/ +/*FUNCTION PentaP1Input::ChangeEnum{{{*/ void PentaP1Input::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION PentaP1Input::GetInputAverage{{{1*/ +/*FUNCTION PentaP1Input::GetInputAverage{{{*/ void PentaP1Input::GetInputAverage(double* pvalue){ *pvalue=1./6.*(values[0]+values[1]+values[2]+values[3]+values[4]+values[5]); @@ -338,5 +338,5 @@ /*Intermediary*/ -/*FUNCTION PentaP1Input::SquareMin{{{1*/ +/*FUNCTION PentaP1Input::SquareMin{{{*/ void PentaP1Input::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ @@ -361,5 +361,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::ConstrainMin{{{1*/ +/*FUNCTION PentaP1Input::ConstrainMin{{{*/ void PentaP1Input::ConstrainMin(double minimum){ @@ -370,5 +370,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::InfinityNorm{{{1*/ +/*FUNCTION PentaP1Input::InfinityNorm{{{*/ double PentaP1Input::InfinityNorm(void){ @@ -381,5 +381,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::Max{{{1*/ +/*FUNCTION PentaP1Input::Max{{{*/ double PentaP1Input::Max(void){ @@ -393,5 +393,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::MaxAbs{{{1*/ +/*FUNCTION PentaP1Input::MaxAbs{{{*/ double PentaP1Input::MaxAbs(void){ @@ -405,5 +405,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::Min{{{1*/ +/*FUNCTION PentaP1Input::Min{{{*/ double PentaP1Input::Min(void){ @@ -417,5 +417,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::MinAbs{{{1*/ +/*FUNCTION PentaP1Input::MinAbs{{{*/ double PentaP1Input::MinAbs(void){ @@ -429,5 +429,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::Scale{{{1*/ +/*FUNCTION PentaP1Input::Scale{{{*/ void PentaP1Input::Scale(double scale_factor){ @@ -438,5 +438,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::AXPY{{{1*/ +/*FUNCTION PentaP1Input::AXPY{{{*/ void PentaP1Input::AXPY(Input* xinput,double scalar){ @@ -465,5 +465,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::Constrain{{{1*/ +/*FUNCTION PentaP1Input::Constrain{{{*/ void PentaP1Input::Constrain(double cm_min, double cm_max){ @@ -476,5 +476,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::Extrude{{{1*/ +/*FUNCTION PentaP1Input::Extrude{{{*/ void PentaP1Input::Extrude(void){ @@ -485,5 +485,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::VerticallyIntegrate{{{1*/ +/*FUNCTION PentaP1Input::VerticallyIntegrate{{{*/ void PentaP1Input::VerticallyIntegrate(Input* thickness_input){ @@ -515,5 +515,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::PointwiseDivide{{{1*/ +/*FUNCTION PentaP1Input::PointwiseDivide{{{*/ Input* PentaP1Input::PointwiseDivide(Input* inputB){ @@ -546,5 +546,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::PointwiseMin{{{1*/ +/*FUNCTION PentaP1Input::PointwiseMin{{{*/ Input* PentaP1Input::PointwiseMin(Input* inputB){ @@ -577,5 +577,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::PointwiseMax{{{1*/ +/*FUNCTION PentaP1Input::PointwiseMax{{{*/ Input* PentaP1Input::PointwiseMax(Input* inputB){ @@ -608,5 +608,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::GetVectorFromInputs{{{1*/ +/*FUNCTION PentaP1Input::GetVectorFromInputs{{{*/ void PentaP1Input::GetVectorFromInputs(Vector* vector,int* doflist){ @@ -615,5 +615,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::GetValuesPtr{{{1*/ +/*FUNCTION PentaP1Input::GetValuesPtr{{{*/ void PentaP1Input::GetValuesPtr(double** pvalues,int* pnum_values){ @@ -623,5 +623,5 @@ } /*}}}*/ -/*FUNCTION PentaP1Input::Configure{{{1*/ +/*FUNCTION PentaP1Input::Configure{{{*/ void PentaP1Input::Configure(Parameters* parameters){ /*do nothing: */ Index: /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/PentaP1Input.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Input.h" #include "../Elements/PentaRef.h" @@ -21,10 +21,10 @@ double values[6]; - /*PentaP1Input constructors, destructors: {{{1*/ + /*PentaP1Input constructors, destructors: {{{*/ PentaP1Input(); PentaP1Input(int enum_type,double* values); ~PentaP1Input(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -34,5 +34,5 @@ Object* copy(); /*}}}*/ - /*PentaP1Input management: {{{1*/ + /*PentaP1Input management: {{{*/ int InstanceEnum(); Input* SpawnTriaInput(int* indices); @@ -44,5 +44,5 @@ void Configure(Parameters* parameters); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void GetInputValue(bool* pvalue){_error_("not implemented yet");}; void GetInputValue(int* pvalue){_error_("not implemented yet");}; Index: /issm/trunk-jpl/src/c/objects/Inputs/TransientInput.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/TransientInput.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/TransientInput.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Input.h" class GaussTria; @@ -23,5 +23,5 @@ Parameters* parameters; //to find current time. - /*TransientInput constructors, destructors: {{{1*/ + /*TransientInput constructors, destructors: {{{*/ TransientInput(); TransientInput(int enum_type); @@ -29,5 +29,5 @@ void AddTimeInput(Input* input,double time); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); @@ -37,5 +37,5 @@ Object* copy(); /*}}}*/ - /*TransientInput management: {{{1*/ + /*TransientInput management: {{{*/ int InstanceEnum(); Input* SpawnTriaInput(int* indices); @@ -46,5 +46,5 @@ void Configure(Parameters* parameters); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void GetInputValue(bool* pvalue){_error_("not implemented yet");}; void GetInputValue(int* pvalue){_error_("not implemented yet");}; Index: /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.cpp (revision 12365) @@ -18,10 +18,10 @@ /*TriaP1Input constructors and destructor*/ -/*FUNCTION TriaP1Input::TriaP1Input(){{{1*/ +/*FUNCTION TriaP1Input::TriaP1Input(){{{*/ TriaP1Input::TriaP1Input(){ return; } /*}}}*/ -/*FUNCTION TriaP1Input::TriaP1Input(int in_enum_type,double* values){{{1*/ +/*FUNCTION TriaP1Input::TriaP1Input(int in_enum_type,double* values){{{*/ TriaP1Input::TriaP1Input(int in_enum_type,double* in_values) :TriaRef(1) @@ -41,5 +41,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::~TriaP1Input(){{{1*/ +/*FUNCTION TriaP1Input::~TriaP1Input(){{{*/ TriaP1Input::~TriaP1Input(){ return; @@ -48,10 +48,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION TriaP1Input::Echo {{{1*/ +/*FUNCTION TriaP1Input::Echo {{{*/ void TriaP1Input::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION TriaP1Input::DeepEcho{{{1*/ +/*FUNCTION TriaP1Input::DeepEcho{{{*/ void TriaP1Input::DeepEcho(void){ @@ -61,8 +61,8 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::Id{{{1*/ +/*FUNCTION TriaP1Input::Id{{{*/ int TriaP1Input::Id(void){ return -1; } /*}}}*/ -/*FUNCTION TriaP1Input::MyRank{{{1*/ +/*FUNCTION TriaP1Input::MyRank{{{*/ int TriaP1Input::MyRank(void){ extern int my_rank; @@ -70,5 +70,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::ObjectEnum{{{1*/ +/*FUNCTION TriaP1Input::ObjectEnum{{{*/ int TriaP1Input::ObjectEnum(void){ @@ -77,5 +77,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::copy{{{1*/ +/*FUNCTION TriaP1Input::copy{{{*/ Object* TriaP1Input::copy() { @@ -86,5 +86,5 @@ /*TriaP1Input management*/ -/*FUNCTION TriaP1Input::InstanceEnum{{{1*/ +/*FUNCTION TriaP1Input::InstanceEnum{{{*/ int TriaP1Input::InstanceEnum(void){ @@ -93,5 +93,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::SpawnTriaInput{{{1*/ +/*FUNCTION TriaP1Input::SpawnTriaInput{{{*/ Input* TriaP1Input::SpawnTriaInput(int* indices){ @@ -107,5 +107,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::SpawnResult{{{1*/ +/*FUNCTION TriaP1Input::SpawnResult{{{*/ ElementResult* TriaP1Input::SpawnResult(int step, double time){ @@ -116,5 +116,5 @@ /*Object functions*/ -/*FUNCTION TriaP1Input::GetInputValue(double* pvalue,GaussTria* gauss){{{1*/ +/*FUNCTION TriaP1Input::GetInputValue(double* pvalue,GaussTria* gauss){{{*/ void TriaP1Input::GetInputValue(double* pvalue,GaussTria* gauss){ @@ -124,5 +124,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{1*/ +/*FUNCTION TriaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){{{*/ void TriaP1Input::GetInputDerivativeValue(double* p, double* xyz_list, GaussTria* gauss){ @@ -131,5 +131,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::GetVxStrainRate2d{{{1*/ +/*FUNCTION TriaP1Input::GetVxStrainRate2d{{{*/ void TriaP1Input::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ @@ -154,5 +154,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::GetVyStrainRate2d{{{1*/ +/*FUNCTION TriaP1Input::GetVyStrainRate2d{{{*/ void TriaP1Input::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ @@ -177,10 +177,10 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::ChangeEnum{{{1*/ +/*FUNCTION TriaP1Input::ChangeEnum{{{*/ void TriaP1Input::ChangeEnum(int newenumtype){ this->enum_type=newenumtype; } /*}}}*/ -/*FUNCTION TriaP1Input::GetInputAverage{{{1*/ +/*FUNCTION TriaP1Input::GetInputAverage{{{*/ void TriaP1Input::GetInputAverage(double* pvalue){ *pvalue=1./3.*(values[0]+values[1]+values[2]); @@ -189,5 +189,5 @@ /*Intermediary*/ -/*FUNCTION TriaP1Input::SquareMin{{{1*/ +/*FUNCTION TriaP1Input::SquareMin{{{*/ void TriaP1Input::SquareMin(double* psquaremin, bool process_units,Parameters* parameters){ @@ -212,5 +212,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::ContrainMin{{{1*/ +/*FUNCTION TriaP1Input::ContrainMin{{{*/ void TriaP1Input::ConstrainMin(double minimum){ @@ -221,5 +221,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::InfinityNorm{{{1*/ +/*FUNCTION TriaP1Input::InfinityNorm{{{*/ double TriaP1Input::InfinityNorm(void){ @@ -232,5 +232,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::Max{{{1*/ +/*FUNCTION TriaP1Input::Max{{{*/ double TriaP1Input::Max(void){ @@ -244,5 +244,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::MaxAbs{{{1*/ +/*FUNCTION TriaP1Input::MaxAbs{{{*/ double TriaP1Input::MaxAbs(void){ @@ -256,5 +256,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::Min{{{1*/ +/*FUNCTION TriaP1Input::Min{{{*/ double TriaP1Input::Min(void){ @@ -268,5 +268,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::MinAbs{{{1*/ +/*FUNCTION TriaP1Input::MinAbs{{{*/ double TriaP1Input::MinAbs(void){ @@ -280,5 +280,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::Scale{{{1*/ +/*FUNCTION TriaP1Input::Scale{{{*/ void TriaP1Input::Scale(double scale_factor){ @@ -289,5 +289,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::ArtificialNoise{{{1*/ +/*FUNCTION TriaP1Input::ArtificialNoise{{{*/ void TriaP1Input::ArtificialNoise(double min,double max){ @@ -305,5 +305,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::AXPY{{{1*/ +/*FUNCTION TriaP1Input::AXPY{{{*/ void TriaP1Input::AXPY(Input* xinput,double scalar){ @@ -328,5 +328,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::Constrain{{{1*/ +/*FUNCTION TriaP1Input::Constrain{{{*/ void TriaP1Input::Constrain(double cm_min, double cm_max){ @@ -339,5 +339,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::GetVectorFromInputs{{{1*/ +/*FUNCTION TriaP1Input::GetVectorFromInputs{{{*/ void TriaP1Input::GetVectorFromInputs(Vector* vector,int* doflist){ @@ -346,5 +346,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::GetValuesPtr{{{1*/ +/*FUNCTION TriaP1Input::GetValuesPtr{{{*/ void TriaP1Input::GetValuesPtr(double** pvalues,int* pnum_values){ @@ -354,5 +354,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::PointwiseMin{{{1*/ +/*FUNCTION TriaP1Input::PointwiseMin{{{*/ Input* TriaP1Input::PointwiseMin(Input* inputB){ @@ -385,5 +385,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::PointwiseMax{{{1*/ +/*FUNCTION TriaP1Input::PointwiseMax{{{*/ Input* TriaP1Input::PointwiseMax(Input* inputB){ @@ -416,5 +416,5 @@ } /*}}}*/ -/*FUNCTION TriaP1Input::Configure{{{1*/ +/*FUNCTION TriaP1Input::Configure{{{*/ void TriaP1Input::Configure(Parameters* parameters){ /*do nothing: */ Index: /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Inputs/TriaP1Input.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Input.h" #include "../Elements/TriaRef.h" @@ -21,10 +21,10 @@ double values[3]; - /*TriaP1Input constructors, destructors: {{{1*/ + /*TriaP1Input constructors, destructors: {{{*/ TriaP1Input(); TriaP1Input(int enum_type,double* values); ~TriaP1Input(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -34,5 +34,5 @@ Object* copy(); /*}}}*/ - /*TriaP1Input management: {{{1*/ + /*TriaP1Input management: {{{*/ int InstanceEnum(); Input* SpawnTriaInput(int* indices); @@ -44,5 +44,5 @@ void Configure(Parameters* parameters); /*}}}*/ - /*numerics: {{{1*/ + /*numerics: {{{*/ void GetInputValue(bool* pvalue){_error_("not implemented yet");} void GetInputValue(int* pvalue){_error_("not implemented yet");} Index: /issm/trunk-jpl/src/c/objects/IoModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/IoModel.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/IoModel.cpp (revision 12365) @@ -22,5 +22,5 @@ #include "../include/include.h" -/*FUNCTION IoModel::IoModel(){{{1*/ +/*FUNCTION IoModel::IoModel(){{{*/ IoModel::IoModel(){ this->fid=NULL; @@ -39,5 +39,5 @@ } /*}}}*/ -/*FUNCTION IoModel::IoModel(FILE* iomodel_handle){{{1*/ +/*FUNCTION IoModel::IoModel(FILE* iomodel_handle){{{*/ IoModel::IoModel(FILE* iomodel_handle){ @@ -68,5 +68,5 @@ } /*}}}*/ -/*FUNCTION IoModel::~IoModel(){{{1*/ +/*FUNCTION IoModel::~IoModel(){{{*/ IoModel::~IoModel(){ @@ -92,5 +92,5 @@ /*}}}*/ -/*FUNCTION IoModel::CheckEnumSync{{{1*/ +/*FUNCTION IoModel::CheckEnumSync{{{*/ void IoModel::CheckEnumSync(void){ @@ -135,5 +135,5 @@ } /*}}}*/ -/*FUNCTION IoModel::Constant(bool* poutput,int constant_enum){{{1*/ +/*FUNCTION IoModel::Constant(bool* poutput,int constant_enum){{{*/ void IoModel::Constant(bool* poutput,int constant_enum){ @@ -144,5 +144,5 @@ } /*}}}*/ -/*FUNCTION IoModel::Constant(int* poutput,int constant_enum){{{1*/ +/*FUNCTION IoModel::Constant(int* poutput,int constant_enum){{{*/ void IoModel::Constant(int* poutput,int constant_enum){ @@ -153,5 +153,5 @@ } /*}}}*/ -/*FUNCTION IoModel::Constant(double* poutput,int constant_enum){{{1*/ +/*FUNCTION IoModel::Constant(double* poutput,int constant_enum){{{*/ void IoModel::Constant(double* poutput,int constant_enum){ @@ -162,5 +162,5 @@ } /*}}}*/ -/*FUNCTION IoModel::Constant(char** poutput,int constant_enum){{{1*/ +/*FUNCTION IoModel::Constant(char** poutput,int constant_enum){{{*/ void IoModel::Constant(char** poutput,int constant_enum){ @@ -171,5 +171,5 @@ } /*}}}*/ -/*FUNCTION IoModel::CopyConstantObject{{{1*/ +/*FUNCTION IoModel::CopyConstantObject{{{*/ Param* IoModel::CopyConstantObject(int constant_enum){ @@ -183,5 +183,5 @@ } /*}}}*/ -/*FUNCTION IoModel::Data{{{1*/ +/*FUNCTION IoModel::Data{{{*/ double* IoModel::Data(int data_enum){ @@ -192,5 +192,5 @@ } /*}}}*/ -/*FUNCTION IoModel::DeleteData{{{1*/ +/*FUNCTION IoModel::DeleteData{{{*/ void IoModel::DeleteData(int num,...){ @@ -210,5 +210,5 @@ va_end(ap); } /*}}}*/ -/*FUNCTION IoModel::FetchConstants{{{1*/ +/*FUNCTION IoModel::FetchConstants{{{*/ void IoModel::FetchConstants(void){ @@ -233,5 +233,5 @@ /*Go find in the binary file, the position of the data we want to fetch: */ - if(my_rank==0){ //cpu 0{{{2 + if(my_rank==0){ //cpu 0{{{ /*First set FILE* position to the beginning of the file: */ @@ -368,5 +368,5 @@ } //}}} #ifdef _HAVE_MPI_ - else{ //cpu ~0 {{{2 + else{ //cpu ~0 {{{ for(;;){ //wait on cpu 0 MPI_Bcast(&record_code,1,MPI_INT,0,MPI_COMM_WORLD); /*get from cpu 0 what we are going to do: */ @@ -440,5 +440,5 @@ } /*}}}*/ -/*FUNCTION IoModel::FetchData(bool* pbool,int data_enum){{{1*/ +/*FUNCTION IoModel::FetchData(bool* pbool,int data_enum){{{*/ void IoModel::FetchData(bool* pboolean,int data_enum){ @@ -470,5 +470,5 @@ } /*}}}*/ -/*FUNCTION IoModel::FetchData(int* pinteger,int data_enum){{{1*/ +/*FUNCTION IoModel::FetchData(int* pinteger,int data_enum){{{*/ void IoModel::FetchData(int* pinteger,int data_enum){ @@ -500,5 +500,5 @@ } /*}}}*/ -/*FUNCTION IoModel::FetchData(double* pscalar,int data_enum){{{1*/ +/*FUNCTION IoModel::FetchData(double* pscalar,int data_enum){{{*/ void IoModel::FetchData(double* pscalar,int data_enum){ @@ -530,5 +530,5 @@ } /*}}}*/ -/*FUNCTION IoModel::FetchData(char** pstring,int data_enum){{{1*/ +/*FUNCTION IoModel::FetchData(char** pstring,int data_enum){{{*/ void IoModel::FetchData(char** pstring,int data_enum){ @@ -581,5 +581,5 @@ } /*}}}*/ -/*FUNCTION IoModel::FetchData(int** pintegerematrix,int* pM,int* pN,int data_enum){{{1*/ +/*FUNCTION IoModel::FetchData(int** pintegerematrix,int* pM,int* pN,int data_enum){{{*/ void IoModel::FetchData(int** pmatrix,int* pM,int* pN,int data_enum){ @@ -656,5 +656,5 @@ } /*}}}*/ -/*FUNCTION IoModel::FetchData(double** pdoublematrix,int* pM,int* pN,int data_enum){{{1*/ +/*FUNCTION IoModel::FetchData(double** pdoublematrix,int* pM,int* pN,int data_enum){{{*/ void IoModel::FetchData(double** pmatrix,int* pM,int* pN,int data_enum){ @@ -709,5 +709,5 @@ } /*}}}*/ -/*FUNCTION IoModel::FetchData(char*** pstrings,int* pnumstrings,int data_enum){{{1*/ +/*FUNCTION IoModel::FetchData(char*** pstrings,int* pnumstrings,int data_enum){{{*/ void IoModel::FetchData(char*** pstrings,int* pnumstrings,int data_enum){ @@ -779,5 +779,5 @@ } /*}}}*/ -/*FUNCTION IoModel::FetchData(double*** pmatrices,int** pmdims,int** pndims, int* pM,int data_enum){{{1*/ +/*FUNCTION IoModel::FetchData(double*** pmatrices,int** pmdims,int** pndims, int* pM,int data_enum){{{*/ void IoModel::FetchData(double*** pmatrices,int** pmdims,int** pndims, int* pnumrecords,int data_enum){ @@ -868,5 +868,5 @@ } /*}}}*/ -/*FUNCTION IoModel::FetchData(int num,...){{{1*/ +/*FUNCTION IoModel::FetchData(int num,...){{{*/ void IoModel::FetchData(int num,...){ @@ -903,5 +903,5 @@ } /*}}}*/ -/*FUNCTION IoModel::FetchDataToInput{{{1*/ +/*FUNCTION IoModel::FetchDataToInput{{{*/ void IoModel::FetchDataToInput(Elements* elements,int vector_enum,int default_vector_enum,double default_value){ @@ -935,5 +935,5 @@ switch(code){ - case 1: //boolean constant. {{{2 + case 1: //boolean constant. {{{ this->FetchData(&boolean,vector_enum); @@ -948,5 +948,5 @@ } break; /*}}}*/ - case 2: //integer constant. {{{2 + case 2: //integer constant. {{{ this->FetchData(&integer,vector_enum); @@ -961,5 +961,5 @@ } break; /*}}}*/ - case 3: //double constant. {{{2 + case 3: //double constant. {{{ this->FetchData(&scalar,vector_enum); @@ -974,5 +974,5 @@ } break; /*}}}*/ - case 5: //boolean vector. {{{2 + case 5: //boolean vector. {{{ /*Fetch vector:*/ @@ -1012,5 +1012,5 @@ } break; /*}}}*/ - case 6: //int vector. {{{2 + case 6: //int vector{{{ /*Fetch vector:*/ @@ -1050,5 +1050,5 @@ } break; /*}}}*/ - case 7: //double vector. {{{2 + case 7: //double vector{{{ /*Fetch vector:*/ @@ -1089,5 +1089,5 @@ break; /*}}}*/ - default: /*{{{2*/ + default: /*{{{*/ _error_("%s%i%s","data code ",code," not supported yet!"); break; @@ -1098,5 +1098,5 @@ xfree((void**)&string); } -/*FUNCTION IoModel::SetFilePointerToData{{{1*/ +/*FUNCTION IoModel::SetFilePointerToData{{{*/ FILE* IoModel::SetFilePointerToData(int* pcode,int* pvector_type, int data_enum){ Index: /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -20,5 +20,5 @@ /*}}}*/ -/*FUNCTION KMLFileToken(FILE* fid,int* pncom=NULL,char*** ppcom=NULL) {{{1*/ +/*FUNCTION KMLFileToken(FILE* fid,int* pncom=NULL,char*** ppcom=NULL) {{{*/ char* KMLFileToken(FILE* fid, int* pncom=NULL,char*** ppcom=NULL){ @@ -139,5 +139,5 @@ /*}}}*/ -/*FUNCTION KMLFileTokenComment(FILE* fid) {{{1*/ +/*FUNCTION KMLFileTokenComment(FILE* fid) {{{*/ char* KMLFileTokenComment(FILE* fid){ @@ -204,5 +204,5 @@ /*}}}*/ -/*FUNCTION KMLFileTokenBuffer {{{1*/ +/*FUNCTION KMLFileTokenBuffer {{{*/ void KMLFileTokenBuffer(char** pbuffer,int* pibuf,int* pbuflen, int c, @@ -229,5 +229,5 @@ /*}}}*/ -/*FUNCTION KMLFileTagName {{{1*/ +/*FUNCTION KMLFileTagName {{{*/ char* KMLFileTagName(char* pname, char* ktag){ @@ -238,5 +238,5 @@ /*}}}*/ -/*FUNCTION KMLFileTagName {{{1*/ +/*FUNCTION KMLFileTagName {{{*/ char* KMLFileTagName(char* pname,int *m,int maxlen, char* ktag){ @@ -284,5 +284,5 @@ /*}}}*/ -/*FUNCTION KMLFileTagAttrib {{{1*/ +/*FUNCTION KMLFileTagAttrib {{{*/ int KMLFileTagAttrib(KML_Object* kobj, char* ktag){ @@ -334,5 +334,5 @@ /*}}}*/ -/*FUNCTION KMLFileTokenParse {{{1*/ +/*FUNCTION KMLFileTokenParse {{{*/ int KMLFileTokenParse(int* pival, char* ktag, @@ -369,5 +369,5 @@ /*}}}*/ -/*FUNCTION KMLFileTokenParse {{{1*/ +/*FUNCTION KMLFileTokenParse {{{*/ int KMLFileTokenParse(bool* pbval, char* ktag, @@ -406,5 +406,5 @@ /*}}}*/ -/*FUNCTION KMLFileTokenParse {{{1*/ +/*FUNCTION KMLFileTokenParse {{{*/ char* KMLFileTokenParse(char* pstr, char* ktag, @@ -417,5 +417,5 @@ /*}}}*/ -/*FUNCTION KMLFileTokenParse {{{1*/ +/*FUNCTION KMLFileTokenParse {{{*/ char* KMLFileTokenParse(char* pstr,int *m,int maxlen, char* ktag, @@ -469,5 +469,5 @@ /*}}}*/ -/*FUNCTION KMLFileTokenParse {{{1*/ +/*FUNCTION KMLFileTokenParse {{{*/ int KMLFileTokenParse(float* pfval, char* ktag, @@ -504,5 +504,5 @@ /*}}}*/ -/*FUNCTION KMLFileTokenParse {{{1*/ +/*FUNCTION KMLFileTokenParse {{{*/ int KMLFileTokenParse(double* pdval, char* ktag, @@ -539,5 +539,5 @@ /*}}}*/ -/*FUNCTION KMLFileTokenParse {{{1*/ +/*FUNCTION KMLFileTokenParse {{{*/ int KMLFileTokenParse(double **pdval,int* m,int maxlen, char* ktag, @@ -600,5 +600,5 @@ /*}}}*/ -/*FUNCTION KMLFileTokenParse {{{1*/ +/*FUNCTION KMLFileTokenParse {{{*/ int KMLFileTokenParse(double (**pdval3)[3],int* m,int maxlen, char* ktag, @@ -668,5 +668,5 @@ /*}}}*/ -/*FUNCTION KMLFileTagSkip {{{1*/ +/*FUNCTION KMLFileTagSkip {{{*/ int KMLFileTagSkip(char* ktag, FILE* fid){ Index: /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KMLFileReadUtils.h (revision 12365) @@ -6,5 +6,5 @@ #define _KMLFILEREADUTILS_H -/*Headers:{{{1*/ +/*Headers:{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" Index: /issm/trunk-jpl/src/c/objects/KML/KML_Attribute.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Attribute.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Attribute.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Attribute::KML_Attribute(){{{1*/ +/*FUNCTION KML_Attribute::KML_Attribute(){{{*/ KML_Attribute::KML_Attribute(){ @@ -29,5 +29,5 @@ } /*}}}*/ -/*FUNCTION KML_Attribute::~KML_Attribute(){{{1*/ +/*FUNCTION KML_Attribute::~KML_Attribute(){{{*/ KML_Attribute::~KML_Attribute(){ @@ -39,5 +39,5 @@ /*Other*/ -/*FUNCTION KML_Attribute::Echo {{{1*/ +/*FUNCTION KML_Attribute::Echo {{{*/ void KML_Attribute::Echo(){ @@ -53,5 +53,5 @@ } /*}}}*/ -/*FUNCTION KML_Attribute::DeepEcho {{{1*/ +/*FUNCTION KML_Attribute::DeepEcho {{{*/ void KML_Attribute::DeepEcho(){ @@ -63,5 +63,5 @@ } /*}}}*/ -/*FUNCTION KML_Attribute::DeepEcho {{{1*/ +/*FUNCTION KML_Attribute::DeepEcho {{{*/ void KML_Attribute::DeepEcho(const char* indent){ @@ -77,5 +77,5 @@ } /*}}}*/ -/*FUNCTION KML_Attribute::Write {{{1*/ +/*FUNCTION KML_Attribute::Write {{{*/ void KML_Attribute::Write(FILE* filout,const char* indent){ @@ -87,5 +87,5 @@ } /*}}}*/ -/*FUNCTION KML_Attribute::Read {{{1*/ +/*FUNCTION KML_Attribute::Read {{{*/ void KML_Attribute::Read(FILE* fid,char* kstr){ @@ -97,5 +97,5 @@ } /*}}}*/ -/*FUNCTION KML_Attribute::Alloc {{{1*/ +/*FUNCTION KML_Attribute::Alloc {{{*/ void KML_Attribute::Alloc(const char* namei,const char* valuei){ @@ -109,5 +109,5 @@ } /*}}}*/ -/*FUNCTION KML_Attribute::Add {{{1*/ +/*FUNCTION KML_Attribute::Add {{{*/ void KML_Attribute::Add(DataSet* attrib){ @@ -117,5 +117,5 @@ } /*}}}*/ -/*FUNCTION KML_Attribute::Get {{{1*/ +/*FUNCTION KML_Attribute::Get {{{*/ void KML_Attribute::Get(char** pvalueo,char* deflt){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Attribute.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Attribute.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Attribute.h (revision 12365) @@ -6,5 +6,5 @@ #define _KML_ATTRIBUTE_H_ -/*Headers:{{{1*/ +/*Headers:{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -22,9 +22,9 @@ char* value; - /*KML_Attribute constructors, destructors {{{1*/ + /*KML_Attribute constructors, destructors {{{*/ KML_Attribute(); ~KML_Attribute(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ virtual void Echo(); virtual void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_ColorStyle::KML_ColorStyle(){{{1*/ +/*FUNCTION KML_ColorStyle::KML_ColorStyle(){{{*/ KML_ColorStyle::KML_ColorStyle(){ @@ -29,5 +29,5 @@ } /*}}}*/ -/*FUNCTION KML_ColorStyle::~KML_ColorStyle(){{{1*/ +/*FUNCTION KML_ColorStyle::~KML_ColorStyle(){{{*/ KML_ColorStyle::~KML_ColorStyle(){ @@ -38,5 +38,5 @@ /*Other*/ -/*FUNCTION KML_ColorStyle::Echo {{{1*/ +/*FUNCTION KML_ColorStyle::Echo {{{*/ void KML_ColorStyle::Echo(){ @@ -51,5 +51,5 @@ } /*}}}*/ -/*FUNCTION KML_ColorStyle::DeepEcho {{{1*/ +/*FUNCTION KML_ColorStyle::DeepEcho {{{*/ void KML_ColorStyle::DeepEcho(){ @@ -61,5 +61,5 @@ } /*}}}*/ -/*FUNCTION KML_ColorStyle::DeepEcho {{{1*/ +/*FUNCTION KML_ColorStyle::DeepEcho {{{*/ void KML_ColorStyle::DeepEcho(const char* indent){ @@ -74,5 +74,5 @@ } /*}}}*/ -/*FUNCTION KML_ColorStyle::Write {{{1*/ +/*FUNCTION KML_ColorStyle::Write {{{*/ void KML_ColorStyle::Write(FILE* filout,const char* indent){ @@ -87,5 +87,5 @@ } /*}}}*/ -/*FUNCTION KML_ColorStyle::Read {{{1*/ +/*FUNCTION KML_ColorStyle::Read {{{*/ void KML_ColorStyle::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_ColorStyle.h (revision 12365) @@ -10,5 +10,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -25,9 +25,9 @@ char colormode[KML_COLORSTYLE_COLORMODE_LENGTH+1]; - /*KML_ColorStyle constructors, destructors {{{1*/ + /*KML_ColorStyle constructors, destructors {{{*/ KML_ColorStyle(); ~KML_ColorStyle(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Comment.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Comment.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Comment.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Comment::KML_Comment(){{{1*/ +/*FUNCTION KML_Comment::KML_Comment(){{{*/ KML_Comment::KML_Comment(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION KML_Comment::~KML_Comment(){{{1*/ +/*FUNCTION KML_Comment::~KML_Comment(){{{*/ KML_Comment::~KML_Comment(){ @@ -37,5 +37,5 @@ /*Other*/ -/*FUNCTION KML_Comment::Echo {{{1*/ +/*FUNCTION KML_Comment::Echo {{{*/ void KML_Comment::Echo(){ @@ -48,5 +48,5 @@ } /*}}}*/ -/*FUNCTION KML_Comment::DeepEcho {{{1*/ +/*FUNCTION KML_Comment::DeepEcho {{{*/ void KML_Comment::DeepEcho(){ @@ -58,5 +58,5 @@ } /*}}}*/ -/*FUNCTION KML_Comment::DeepEcho {{{1*/ +/*FUNCTION KML_Comment::DeepEcho {{{*/ void KML_Comment::DeepEcho(const char* indent){ @@ -69,5 +69,5 @@ } /*}}}*/ -/*FUNCTION KML_Comment::Write {{{1*/ +/*FUNCTION KML_Comment::Write {{{*/ void KML_Comment::Write(FILE* filout,const char* indent){ @@ -81,5 +81,5 @@ } /*}}}*/ -/*FUNCTION KML_Comment::Read {{{1*/ +/*FUNCTION KML_Comment::Read {{{*/ void KML_Comment::Read(FILE* fid,char* kstr){ @@ -91,5 +91,5 @@ } /*}}}*/ -/*FUNCTION KML_Comment::Alloc {{{1*/ +/*FUNCTION KML_Comment::Alloc {{{*/ void KML_Comment::Alloc(const char* valuei){ @@ -100,5 +100,5 @@ } /*}}}*/ -/*FUNCTION KML_Comment::Add {{{1*/ +/*FUNCTION KML_Comment::Add {{{*/ void KML_Comment::Add(DataSet* commnt){ @@ -108,5 +108,5 @@ } /*}}}*/ -/*FUNCTION KML_Comment::Get {{{1*/ +/*FUNCTION KML_Comment::Get {{{*/ void KML_Comment::Get(char** pvalueo){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Comment.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Comment.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Comment.h (revision 12365) @@ -6,5 +6,5 @@ #define _KML_COMMENT_H_ -/*Headers:{{{1*/ +/*Headers:{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -22,9 +22,9 @@ char* value; - /*KML_Comment constructors, destructors {{{1*/ + /*KML_Comment constructors, destructors {{{*/ KML_Comment(); ~KML_Comment(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ virtual void Echo(); virtual void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Container.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Container.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Container.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Container::KML_Container(){{{1*/ +/*FUNCTION KML_Container::KML_Container(){{{*/ KML_Container::KML_Container(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION KML_Container::~KML_Container(){{{1*/ +/*FUNCTION KML_Container::~KML_Container(){{{*/ KML_Container::~KML_Container(){ @@ -40,5 +40,5 @@ /*Other*/ -/*FUNCTION KML_Container::Echo {{{1*/ +/*FUNCTION KML_Container::Echo {{{*/ void KML_Container::Echo(){ @@ -52,5 +52,5 @@ } /*}}}*/ -/*FUNCTION KML_Container::DeepEcho {{{1*/ +/*FUNCTION KML_Container::DeepEcho {{{*/ void KML_Container::DeepEcho(){ @@ -62,5 +62,5 @@ } /*}}}*/ -/*FUNCTION KML_Container::DeepEcho {{{1*/ +/*FUNCTION KML_Container::DeepEcho {{{*/ void KML_Container::DeepEcho(const char* indent){ @@ -88,5 +88,5 @@ } /*}}}*/ -/*FUNCTION KML_Container::Write {{{1*/ +/*FUNCTION KML_Container::Write {{{*/ void KML_Container::Write(FILE* filout,const char* indent){ @@ -108,5 +108,5 @@ } /*}}}*/ -/*FUNCTION KML_Container::Read {{{1*/ +/*FUNCTION KML_Container::Read {{{*/ void KML_Container::Read(FILE* fid,char* kstr){ @@ -154,5 +154,5 @@ } /*}}}*/ -/*FUNCTION KML_Container::WriteExp {{{1*/ +/*FUNCTION KML_Container::WriteExp {{{*/ void KML_Container::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Container.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Container.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Container.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -22,9 +22,9 @@ DataSet* feature; - /*KML_Container constructors, destructors {{{1*/ + /*KML_Container constructors, destructors {{{*/ KML_Container(); ~KML_Container(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Document.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Document.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Document.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Document::KML_Document(){{{1*/ +/*FUNCTION KML_Document::KML_Document(){{{*/ KML_Document::KML_Document(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION KML_Document::~KML_Document(){{{1*/ +/*FUNCTION KML_Document::~KML_Document(){{{*/ KML_Document::~KML_Document(){ @@ -37,5 +37,5 @@ /*Other*/ -/*FUNCTION KML_Document::Echo {{{1*/ +/*FUNCTION KML_Document::Echo {{{*/ void KML_Document::Echo(){ @@ -49,5 +49,5 @@ /*}}}*/ -/*FUNCTION KML_Document::DeepEcho {{{1*/ +/*FUNCTION KML_Document::DeepEcho {{{*/ void KML_Document::DeepEcho(){ @@ -60,5 +60,5 @@ /*}}}*/ -/*FUNCTION KML_Document::DeepEcho {{{1*/ +/*FUNCTION KML_Document::DeepEcho {{{*/ void KML_Document::DeepEcho(const char* indent){ @@ -72,5 +72,5 @@ /*}}}*/ -/*FUNCTION KML_Document::Write {{{1*/ +/*FUNCTION KML_Document::Write {{{*/ void KML_Document::Write(FILE* filout,const char* indent){ @@ -88,5 +88,5 @@ /*}}}*/ -/*FUNCTION KML_Document::Read {{{1*/ +/*FUNCTION KML_Document::Read {{{*/ void KML_Document::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Document.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Document.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Document.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -20,9 +20,9 @@ public: - /*KML_Document constructors, destructors {{{1*/ + /*KML_Document constructors, destructors {{{*/ KML_Document(); ~KML_Document(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Feature.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Feature.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Feature.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Feature::KML_Feature(){{{1*/ +/*FUNCTION KML_Feature::KML_Feature(){{{*/ KML_Feature::KML_Feature(){ @@ -35,5 +35,5 @@ } /*}}}*/ -/*FUNCTION KML_Feature::~KML_Feature(){{{1*/ +/*FUNCTION KML_Feature::~KML_Feature(){{{*/ KML_Feature::~KML_Feature(){ @@ -47,5 +47,5 @@ /*Other*/ -/*FUNCTION KML_Feature::Echo {{{1*/ +/*FUNCTION KML_Feature::Echo {{{*/ void KML_Feature::Echo(){ @@ -66,5 +66,5 @@ /*}}}*/ -/*FUNCTION KML_Feature::DeepEcho {{{1*/ +/*FUNCTION KML_Feature::DeepEcho {{{*/ void KML_Feature::DeepEcho(){ @@ -77,5 +77,5 @@ /*}}}*/ -/*FUNCTION KML_Feature::DeepEcho {{{1*/ +/*FUNCTION KML_Feature::DeepEcho {{{*/ void KML_Feature::DeepEcho(const char* indent){ @@ -111,5 +111,5 @@ /*}}}*/ -/*FUNCTION KML_Feature::Write {{{1*/ +/*FUNCTION KML_Feature::Write {{{*/ void KML_Feature::Write(FILE* filout,const char* indent){ @@ -143,5 +143,5 @@ /*}}}*/ -/*FUNCTION KML_Feature::Read {{{1*/ +/*FUNCTION KML_Feature::Read {{{*/ void KML_Feature::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Feature.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Feature.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Feature.h (revision 12365) @@ -12,5 +12,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -34,9 +34,9 @@ DataSet* style; - /*KML_Feature constructors, destructors {{{1*/ + /*KML_Feature constructors, destructors {{{*/ KML_Feature(); ~KML_Feature(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_File.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_File.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_File.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_File::KML_File(){{{1*/ +/*FUNCTION KML_File::KML_File(){{{*/ KML_File::KML_File(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION KML_File::~KML_File(){{{1*/ +/*FUNCTION KML_File::~KML_File(){{{*/ KML_File::~KML_File(){ @@ -37,5 +37,5 @@ /*Other*/ -/*FUNCTION KML_File::Echo {{{1*/ +/*FUNCTION KML_File::Echo {{{*/ void KML_File::Echo(){ @@ -48,5 +48,5 @@ } /*}}}*/ -/*FUNCTION KML_File::DeepEcho {{{1*/ +/*FUNCTION KML_File::DeepEcho {{{*/ void KML_File::DeepEcho(){ @@ -58,5 +58,5 @@ } /*}}}*/ -/*FUNCTION KML_File::DeepEcho {{{1*/ +/*FUNCTION KML_File::DeepEcho {{{*/ void KML_File::DeepEcho(const char* indent){ @@ -69,5 +69,5 @@ } /*}}}*/ -/*FUNCTION KML_File::Write {{{1*/ +/*FUNCTION KML_File::Write {{{*/ void KML_File::Write(FILE* filout,const char* indent){ @@ -84,5 +84,5 @@ } /*}}}*/ -/*FUNCTION KML_File::Read {{{1*/ +/*FUNCTION KML_File::Read {{{*/ void KML_File::Read(FILE* fid,char* kstr){ @@ -126,5 +126,5 @@ } /*}}}*/ -/*FUNCTION KML_File::WriteExp {{{1*/ +/*FUNCTION KML_File::WriteExp {{{*/ void KML_File::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_File.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_File.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_File.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -20,9 +20,9 @@ public: - /*KML_File constructors, destructors {{{1*/ + /*KML_File constructors, destructors {{{*/ KML_File(); ~KML_File(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Folder.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Folder.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Folder.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Folder::KML_Folder(){{{1*/ +/*FUNCTION KML_Folder::KML_Folder(){{{*/ KML_Folder::KML_Folder(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION KML_Folder::~KML_Folder(){{{1*/ +/*FUNCTION KML_Folder::~KML_Folder(){{{*/ KML_Folder::~KML_Folder(){ @@ -37,5 +37,5 @@ /*Other*/ -/*FUNCTION KML_Folder::Echo {{{1*/ +/*FUNCTION KML_Folder::Echo {{{*/ void KML_Folder::Echo(){ @@ -49,5 +49,5 @@ /*}}}*/ -/*FUNCTION KML_Folder::DeepEcho {{{1*/ +/*FUNCTION KML_Folder::DeepEcho {{{*/ void KML_Folder::DeepEcho(){ @@ -60,5 +60,5 @@ /*}}}*/ -/*FUNCTION KML_Folder::DeepEcho {{{1*/ +/*FUNCTION KML_Folder::DeepEcho {{{*/ void KML_Folder::DeepEcho(const char* indent){ @@ -72,5 +72,5 @@ /*}}}*/ -/*FUNCTION KML_Folder::Write {{{1*/ +/*FUNCTION KML_Folder::Write {{{*/ void KML_Folder::Write(FILE* filout,const char* indent){ @@ -88,5 +88,5 @@ /*}}}*/ -/*FUNCTION KML_Folder::Read {{{1*/ +/*FUNCTION KML_Folder::Read {{{*/ void KML_Folder::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Folder.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Folder.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Folder.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -20,9 +20,9 @@ public: - /*KML_Folder constructors, destructors {{{1*/ + /*KML_Folder constructors, destructors {{{*/ KML_Folder(); ~KML_Folder(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Geometry.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Geometry.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Geometry.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -20,5 +20,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Geometry::KML_Geometry(){{{1*/ +/*FUNCTION KML_Geometry::KML_Geometry(){{{*/ KML_Geometry::KML_Geometry(){ @@ -27,5 +27,5 @@ } /*}}}*/ -/*FUNCTION KML_Geometry::~KML_Geometry(){{{1*/ +/*FUNCTION KML_Geometry::~KML_Geometry(){{{*/ KML_Geometry::~KML_Geometry(){ @@ -36,5 +36,5 @@ /*Other*/ -/*FUNCTION KML_Geometry::Echo {{{1*/ +/*FUNCTION KML_Geometry::Echo {{{*/ void KML_Geometry::Echo(){ @@ -45,5 +45,5 @@ /*}}}*/ -/*FUNCTION KML_Geometry::DeepEcho {{{1*/ +/*FUNCTION KML_Geometry::DeepEcho {{{*/ void KML_Geometry::DeepEcho(){ @@ -56,5 +56,5 @@ /*}}}*/ -/*FUNCTION KML_Geometry::DeepEcho {{{1*/ +/*FUNCTION KML_Geometry::DeepEcho {{{*/ void KML_Geometry::DeepEcho(const char* indent){ @@ -65,5 +65,5 @@ /*}}}*/ -/*FUNCTION KML_Geometry::Write {{{1*/ +/*FUNCTION KML_Geometry::Write {{{*/ void KML_Geometry::Write(FILE* filout,const char* indent){ @@ -74,5 +74,5 @@ /*}}}*/ -/*FUNCTION KML_Geometry::Read {{{1*/ +/*FUNCTION KML_Geometry::Read {{{*/ void KML_Geometry::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Geometry.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Geometry.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Geometry.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -19,9 +19,9 @@ public: - /*KML_Geometry constructors, destructors {{{1*/ + /*KML_Geometry constructors, destructors {{{*/ KML_Geometry(); ~KML_Geometry(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_GroundOverlay.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_GroundOverlay.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_GroundOverlay.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_GroundOverlay::KML_GroundOverlay(){{{1*/ +/*FUNCTION KML_GroundOverlay::KML_GroundOverlay(){{{*/ KML_GroundOverlay::KML_GroundOverlay(){ @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION KML_GroundOverlay::~KML_GroundOverlay(){{{1*/ +/*FUNCTION KML_GroundOverlay::~KML_GroundOverlay(){{{*/ KML_GroundOverlay::~KML_GroundOverlay(){ @@ -43,5 +43,5 @@ /*Other*/ -/*FUNCTION KML_GroundOverlay::Echo {{{1*/ +/*FUNCTION KML_GroundOverlay::Echo {{{*/ void KML_GroundOverlay::Echo(){ @@ -59,5 +59,5 @@ /*}}}*/ -/*FUNCTION KML_GroundOverlay::DeepEcho {{{1*/ +/*FUNCTION KML_GroundOverlay::DeepEcho {{{*/ void KML_GroundOverlay::DeepEcho(){ @@ -70,5 +70,5 @@ /*}}}*/ -/*FUNCTION KML_GroundOverlay::DeepEcho {{{1*/ +/*FUNCTION KML_GroundOverlay::DeepEcho {{{*/ void KML_GroundOverlay::DeepEcho(const char* indent){ @@ -93,5 +93,5 @@ /*}}}*/ -/*FUNCTION KML_GroundOverlay::Write {{{1*/ +/*FUNCTION KML_GroundOverlay::Write {{{*/ void KML_GroundOverlay::Write(FILE* filout,const char* indent){ @@ -120,5 +120,5 @@ /*}}}*/ -/*FUNCTION KML_GroundOverlay::Read {{{1*/ +/*FUNCTION KML_GroundOverlay::Read {{{*/ void KML_GroundOverlay::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_GroundOverlay.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_GroundOverlay.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_GroundOverlay.h (revision 12365) @@ -9,5 +9,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -26,9 +26,9 @@ KML_LatLonBox* llbox; - /*KML_GroundOverlay constructors, destructors {{{1*/ + /*KML_GroundOverlay constructors, destructors {{{*/ KML_GroundOverlay(); ~KML_GroundOverlay(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Icon.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Icon.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Icon.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Icon::KML_Icon(){{{1*/ +/*FUNCTION KML_Icon::KML_Icon(){{{*/ KML_Icon::KML_Icon(){ @@ -35,5 +35,5 @@ } /*}}}*/ -/*FUNCTION KML_Icon::~KML_Icon(){{{1*/ +/*FUNCTION KML_Icon::~KML_Icon(){{{*/ KML_Icon::~KML_Icon(){ @@ -44,5 +44,5 @@ /*Other*/ -/*FUNCTION KML_Icon::Echo {{{1*/ +/*FUNCTION KML_Icon::Echo {{{*/ void KML_Icon::Echo(){ @@ -65,5 +65,5 @@ /*}}}*/ -/*FUNCTION KML_Icon::DeepEcho {{{1*/ +/*FUNCTION KML_Icon::DeepEcho {{{*/ void KML_Icon::DeepEcho(){ @@ -76,5 +76,5 @@ /*}}}*/ -/*FUNCTION KML_Icon::DeepEcho {{{1*/ +/*FUNCTION KML_Icon::DeepEcho {{{*/ void KML_Icon::DeepEcho(const char* indent){ @@ -97,5 +97,5 @@ /*}}}*/ -/*FUNCTION KML_Icon::Write {{{1*/ +/*FUNCTION KML_Icon::Write {{{*/ void KML_Icon::Write(FILE* filout,const char* indent){ @@ -127,5 +127,5 @@ /*}}}*/ -/*FUNCTION KML_Icon::Read {{{1*/ +/*FUNCTION KML_Icon::Read {{{*/ void KML_Icon::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Icon.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Icon.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Icon.h (revision 12365) @@ -13,5 +13,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -34,9 +34,9 @@ char hquery[KML_ICON_HQUERY_LENGTH+1]; - /*KML_Icon constructors, destructors {{{1*/ + /*KML_Icon constructors, destructors {{{*/ KML_Icon(); ~KML_Icon(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_LatLonBox.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_LatLonBox.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_LatLonBox.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_LatLonBox::KML_LatLonBox(){{{1*/ +/*FUNCTION KML_LatLonBox::KML_LatLonBox(){{{*/ KML_LatLonBox::KML_LatLonBox(){ @@ -32,5 +32,5 @@ } /*}}}*/ -/*FUNCTION KML_LatLonBox::~KML_LatLonBox(){{{1*/ +/*FUNCTION KML_LatLonBox::~KML_LatLonBox(){{{*/ KML_LatLonBox::~KML_LatLonBox(){ @@ -41,5 +41,5 @@ /*Other*/ -/*FUNCTION KML_LatLonBox::Echo {{{1*/ +/*FUNCTION KML_LatLonBox::Echo {{{*/ void KML_LatLonBox::Echo(){ @@ -59,5 +59,5 @@ /*}}}*/ -/*FUNCTION KML_LatLonBox::DeepEcho {{{1*/ +/*FUNCTION KML_LatLonBox::DeepEcho {{{*/ void KML_LatLonBox::DeepEcho(){ @@ -70,5 +70,5 @@ /*}}}*/ -/*FUNCTION KML_LatLonBox::DeepEcho {{{1*/ +/*FUNCTION KML_LatLonBox::DeepEcho {{{*/ void KML_LatLonBox::DeepEcho(const char* indent){ @@ -88,5 +88,5 @@ /*}}}*/ -/*FUNCTION KML_LatLonBox::Write {{{1*/ +/*FUNCTION KML_LatLonBox::Write {{{*/ void KML_LatLonBox::Write(FILE* filout,const char* indent){ @@ -110,5 +110,5 @@ /*}}}*/ -/*FUNCTION KML_LatLonBox::Read {{{1*/ +/*FUNCTION KML_LatLonBox::Read {{{*/ void KML_LatLonBox::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_LatLonBox.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_LatLonBox.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_LatLonBox.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -25,9 +25,9 @@ double rotation; - /*KML_LatLonBox constructors, destructors {{{1*/ + /*KML_LatLonBox constructors, destructors {{{*/ KML_LatLonBox(); ~KML_LatLonBox(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_LineString.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_LineString.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_LineString.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -22,5 +22,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_LineString::KML_LineString(){{{1*/ +/*FUNCTION KML_LineString::KML_LineString(){{{*/ KML_LineString::KML_LineString(){ @@ -34,5 +34,5 @@ } /*}}}*/ -/*FUNCTION KML_LineString::~KML_LineString(){{{1*/ +/*FUNCTION KML_LineString::~KML_LineString(){{{*/ KML_LineString::~KML_LineString(){ @@ -46,5 +46,5 @@ /*Other*/ -/*FUNCTION KML_LineString::Echo {{{1*/ +/*FUNCTION KML_LineString::Echo {{{*/ void KML_LineString::Echo(){ @@ -62,5 +62,5 @@ } /*}}}*/ -/*FUNCTION KML_LineString::DeepEcho {{{1*/ +/*FUNCTION KML_LineString::DeepEcho {{{*/ void KML_LineString::DeepEcho(){ @@ -72,5 +72,5 @@ } /*}}}*/ -/*FUNCTION KML_LineString::DeepEcho {{{1*/ +/*FUNCTION KML_LineString::DeepEcho {{{*/ void KML_LineString::DeepEcho(const char* indent){ @@ -92,5 +92,5 @@ } /*}}}*/ -/*FUNCTION KML_LineString::Write {{{1*/ +/*FUNCTION KML_LineString::Write {{{*/ void KML_LineString::Write(FILE* filout,const char* indent){ @@ -121,5 +121,5 @@ } /*}}}*/ -/*FUNCTION KML_LineString::Read {{{1*/ +/*FUNCTION KML_LineString::Read {{{*/ void KML_LineString::Read(FILE* fid,char* kstr){ @@ -179,5 +179,5 @@ } /*}}}*/ -/*FUNCTION KML_LineString::WriteExp {{{1*/ +/*FUNCTION KML_LineString::WriteExp {{{*/ void KML_LineString::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_LineString.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_LineString.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_LineString.h (revision 12365) @@ -9,5 +9,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -27,9 +27,9 @@ double (*coords)[3]; - /*KML_LineString constructors, destructors {{{1*/ + /*KML_LineString constructors, destructors {{{*/ KML_LineString(); ~KML_LineString(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_LineStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_LineStyle.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_LineStyle.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_LineStyle::KML_LineStyle(){{{1*/ +/*FUNCTION KML_LineStyle::KML_LineStyle(){{{*/ KML_LineStyle::KML_LineStyle(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION KML_LineStyle::~KML_LineStyle(){{{1*/ +/*FUNCTION KML_LineStyle::~KML_LineStyle(){{{*/ KML_LineStyle::~KML_LineStyle(){ @@ -37,5 +37,5 @@ /*Other*/ -/*FUNCTION KML_LineStyle::Echo {{{1*/ +/*FUNCTION KML_LineStyle::Echo {{{*/ void KML_LineStyle::Echo(){ @@ -51,5 +51,5 @@ /*}}}*/ -/*FUNCTION KML_LineStyle::DeepEcho {{{1*/ +/*FUNCTION KML_LineStyle::DeepEcho {{{*/ void KML_LineStyle::DeepEcho(){ @@ -62,5 +62,5 @@ /*}}}*/ -/*FUNCTION KML_LineStyle::DeepEcho {{{1*/ +/*FUNCTION KML_LineStyle::DeepEcho {{{*/ void KML_LineStyle::DeepEcho(const char* indent){ @@ -77,5 +77,5 @@ /*}}}*/ -/*FUNCTION KML_LineStyle::Write {{{1*/ +/*FUNCTION KML_LineStyle::Write {{{*/ void KML_LineStyle::Write(FILE* filout,const char* indent){ @@ -95,5 +95,5 @@ /*}}}*/ -/*FUNCTION KML_LineStyle::Read {{{1*/ +/*FUNCTION KML_LineStyle::Read {{{*/ void KML_LineStyle::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_LineStyle.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_LineStyle.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_LineStyle.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -21,9 +21,9 @@ float width; - /*KML_LineStyle constructors, destructors {{{1*/ + /*KML_LineStyle constructors, destructors {{{*/ KML_LineStyle(); ~KML_LineStyle(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -22,5 +22,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_LinearRing::KML_LinearRing(){{{1*/ +/*FUNCTION KML_LinearRing::KML_LinearRing(){{{*/ KML_LinearRing::KML_LinearRing(){ @@ -34,5 +34,5 @@ } /*}}}*/ -/*FUNCTION KML_LinearRing::~KML_LinearRing(){{{1*/ +/*FUNCTION KML_LinearRing::~KML_LinearRing(){{{*/ KML_LinearRing::~KML_LinearRing(){ @@ -46,5 +46,5 @@ /*Other*/ -/*FUNCTION KML_LinearRing::Echo {{{1*/ +/*FUNCTION KML_LinearRing::Echo {{{*/ void KML_LinearRing::Echo(){ @@ -63,5 +63,5 @@ /*}}}*/ -/*FUNCTION KML_LinearRing::DeepEcho {{{1*/ +/*FUNCTION KML_LinearRing::DeepEcho {{{*/ void KML_LinearRing::DeepEcho(){ @@ -74,5 +74,5 @@ /*}}}*/ -/*FUNCTION KML_LinearRing::DeepEcho {{{1*/ +/*FUNCTION KML_LinearRing::DeepEcho {{{*/ void KML_LinearRing::DeepEcho(const char* indent){ @@ -95,5 +95,5 @@ /*}}}*/ -/*FUNCTION KML_LinearRing::Write {{{1*/ +/*FUNCTION KML_LinearRing::Write {{{*/ void KML_LinearRing::Write(FILE* filout,const char* indent){ @@ -125,5 +125,5 @@ /*}}}*/ -/*FUNCTION KML_LinearRing::Read {{{1*/ +/*FUNCTION KML_LinearRing::Read {{{*/ void KML_LinearRing::Read(FILE* fid,char* kstr){ @@ -184,5 +184,5 @@ /*}}}*/ -/*FUNCTION KML_LinearRing::WriteExp {{{1*/ +/*FUNCTION KML_LinearRing::WriteExp {{{*/ void KML_LinearRing::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_LinearRing.h (revision 12365) @@ -9,5 +9,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -27,9 +27,9 @@ double (*coords)[3]; - /*KML_LinearRing constructors, destructors {{{1*/ + /*KML_LinearRing constructors, destructors {{{*/ KML_LinearRing(); ~KML_LinearRing(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_MultiGeometry::KML_MultiGeometry(){{{1*/ +/*FUNCTION KML_MultiGeometry::KML_MultiGeometry(){{{*/ KML_MultiGeometry::KML_MultiGeometry(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION KML_MultiGeometry::~KML_MultiGeometry(){{{1*/ +/*FUNCTION KML_MultiGeometry::~KML_MultiGeometry(){{{*/ KML_MultiGeometry::~KML_MultiGeometry(){ @@ -40,5 +40,5 @@ /*Other*/ -/*FUNCTION KML_MultiGeometry::Echo {{{1*/ +/*FUNCTION KML_MultiGeometry::Echo {{{*/ void KML_MultiGeometry::Echo(){ @@ -54,5 +54,5 @@ /*}}}*/ -/*FUNCTION KML_MultiGeometry::DeepEcho {{{1*/ +/*FUNCTION KML_MultiGeometry::DeepEcho {{{*/ void KML_MultiGeometry::DeepEcho(){ @@ -65,5 +65,5 @@ /*}}}*/ -/*FUNCTION KML_MultiGeometry::DeepEcho {{{1*/ +/*FUNCTION KML_MultiGeometry::DeepEcho {{{*/ void KML_MultiGeometry::DeepEcho(const char* indent){ @@ -93,5 +93,5 @@ /*}}}*/ -/*FUNCTION KML_MultiGeometry::Write {{{1*/ +/*FUNCTION KML_MultiGeometry::Write {{{*/ void KML_MultiGeometry::Write(FILE* filout,const char* indent){ @@ -121,5 +121,5 @@ /*}}}*/ -/*FUNCTION KML_MultiGeometry::Read {{{1*/ +/*FUNCTION KML_MultiGeometry::Read {{{*/ void KML_MultiGeometry::Read(FILE* fid,char* kstr){ @@ -194,5 +194,5 @@ /*}}}*/ -/*FUNCTION KML_MultiGeometry::WriteExp {{{1*/ +/*FUNCTION KML_MultiGeometry::WriteExp {{{*/ void KML_MultiGeometry::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_MultiGeometry.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -23,9 +23,9 @@ DataSet* geometry; - /*KML_MultiGeometry constructors, destructors {{{1*/ + /*KML_MultiGeometry constructors, destructors {{{*/ KML_MultiGeometry(); ~KML_MultiGeometry(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Object.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Object::KML_Object(){{{1*/ +/*FUNCTION KML_Object::KML_Object(){{{*/ KML_Object::KML_Object(){ @@ -30,5 +30,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::~KML_Object(){{{1*/ +/*FUNCTION KML_Object::~KML_Object(){{{*/ KML_Object::~KML_Object(){ @@ -50,5 +50,5 @@ /*Other*/ -/*FUNCTION KML_Object::Echo {{{1*/ +/*FUNCTION KML_Object::Echo {{{*/ void KML_Object::Echo(){ @@ -62,5 +62,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::DeepEcho {{{1*/ +/*FUNCTION KML_Object::DeepEcho {{{*/ void KML_Object::DeepEcho(){ @@ -72,5 +72,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::DeepEcho {{{1*/ +/*FUNCTION KML_Object::DeepEcho {{{*/ void KML_Object::DeepEcho(const char* indent){ @@ -114,5 +114,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::Write {{{1*/ +/*FUNCTION KML_Object::Write {{{*/ void KML_Object::Write(FILE* filout,const char* indent){ @@ -136,5 +136,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::Read {{{1*/ +/*FUNCTION KML_Object::Read {{{*/ void KML_Object::Read(FILE* fid,char* kstr){ @@ -264,5 +264,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::WriteExp {{{1*/ +/*FUNCTION KML_Object::WriteExp {{{*/ void KML_Object::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){ @@ -272,5 +272,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::AddAttrib {{{1*/ +/*FUNCTION KML_Object::AddAttrib {{{*/ void KML_Object::AddAttrib(const char* name,const char* value){ @@ -284,5 +284,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::FindAttrib {{{1*/ +/*FUNCTION KML_Object::FindAttrib {{{*/ void KML_Object::FindAttrib(char** pvalue,char* name,char* deflt){ @@ -311,5 +311,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::WriteAttrib {{{1*/ +/*FUNCTION KML_Object::WriteAttrib {{{*/ void KML_Object::WriteAttrib(FILE* filout,const char* indent){ @@ -325,5 +325,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::AddCommnt {{{1*/ +/*FUNCTION KML_Object::AddCommnt {{{*/ void KML_Object::AddCommnt(int ncom,char** pcom){ @@ -340,5 +340,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::AddCommnt {{{1*/ +/*FUNCTION KML_Object::AddCommnt {{{*/ void KML_Object::AddCommnt(char* value){ @@ -352,5 +352,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::FindCommnt {{{1*/ +/*FUNCTION KML_Object::FindCommnt {{{*/ void KML_Object::FindCommnt(char** pvalue,int inum){ @@ -370,5 +370,5 @@ } /*}}}*/ -/*FUNCTION KML_Object::WriteCommnt {{{1*/ +/*FUNCTION KML_Object::WriteCommnt {{{*/ void KML_Object::WriteCommnt(FILE* filout,const char* indent){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Object.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Object.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Object.h (revision 12365) @@ -6,5 +6,5 @@ #define _KML_OBJECT_H_ -/*Headers:{{{1*/ +/*Headers:{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -23,9 +23,9 @@ DataSet* kmlobj; - /*KML_Object constructors, destructors {{{1*/ + /*KML_Object constructors, destructors {{{*/ KML_Object(); ~KML_Object(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ virtual void Echo(); virtual void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Overlay.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Overlay.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Overlay.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Overlay::KML_Overlay(){{{1*/ +/*FUNCTION KML_Overlay::KML_Overlay(){{{*/ KML_Overlay::KML_Overlay(){ @@ -32,5 +32,5 @@ } /*}}}*/ -/*FUNCTION KML_Overlay::~KML_Overlay(){{{1*/ +/*FUNCTION KML_Overlay::~KML_Overlay(){{{*/ KML_Overlay::~KML_Overlay(){ @@ -44,5 +44,5 @@ /*Other*/ -/*FUNCTION KML_Overlay::Echo {{{1*/ +/*FUNCTION KML_Overlay::Echo {{{*/ void KML_Overlay::Echo(){ @@ -59,5 +59,5 @@ /*}}}*/ -/*FUNCTION KML_Overlay::DeepEcho {{{1*/ +/*FUNCTION KML_Overlay::DeepEcho {{{*/ void KML_Overlay::DeepEcho(){ @@ -70,5 +70,5 @@ /*}}}*/ -/*FUNCTION KML_Overlay::DeepEcho {{{1*/ +/*FUNCTION KML_Overlay::DeepEcho {{{*/ void KML_Overlay::DeepEcho(const char* indent){ @@ -92,5 +92,5 @@ /*}}}*/ -/*FUNCTION KML_Overlay::Write {{{1*/ +/*FUNCTION KML_Overlay::Write {{{*/ void KML_Overlay::Write(FILE* filout,const char* indent){ @@ -113,5 +113,5 @@ /*}}}*/ -/*FUNCTION KML_Overlay::Read {{{1*/ +/*FUNCTION KML_Overlay::Read {{{*/ void KML_Overlay::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Overlay.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Overlay.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Overlay.h (revision 12365) @@ -9,5 +9,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -26,9 +26,9 @@ KML_Icon* icon; - /*KML_Overlay constructors, destructors {{{1*/ + /*KML_Overlay constructors, destructors {{{*/ KML_Overlay(); ~KML_Overlay(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Placemark.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Placemark.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Placemark.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Placemark::KML_Placemark(){{{1*/ +/*FUNCTION KML_Placemark::KML_Placemark(){{{*/ KML_Placemark::KML_Placemark(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION KML_Placemark::~KML_Placemark(){{{1*/ +/*FUNCTION KML_Placemark::~KML_Placemark(){{{*/ KML_Placemark::~KML_Placemark(){ @@ -40,5 +40,5 @@ /*Other*/ -/*FUNCTION KML_Placemark::Echo {{{1*/ +/*FUNCTION KML_Placemark::Echo {{{*/ void KML_Placemark::Echo(){ @@ -53,5 +53,5 @@ } /*}}}*/ -/*FUNCTION KML_Placemark::DeepEcho {{{1*/ +/*FUNCTION KML_Placemark::DeepEcho {{{*/ void KML_Placemark::DeepEcho(){ @@ -63,5 +63,5 @@ } /*}}}*/ -/*FUNCTION KML_Placemark::DeepEcho {{{1*/ +/*FUNCTION KML_Placemark::DeepEcho {{{*/ void KML_Placemark::DeepEcho(const char* indent){ @@ -90,5 +90,5 @@ } /*}}}*/ -/*FUNCTION KML_Placemark::Write {{{1*/ +/*FUNCTION KML_Placemark::Write {{{*/ void KML_Placemark::Write(FILE* filout,const char* indent){ @@ -117,5 +117,5 @@ } /*}}}*/ -/*FUNCTION KML_Placemark::Read {{{1*/ +/*FUNCTION KML_Placemark::Read {{{*/ void KML_Placemark::Read(FILE* fid,char* kstr){ @@ -189,5 +189,5 @@ } /*}}}*/ -/*FUNCTION KML_Placemark::WriteExp {{{1*/ +/*FUNCTION KML_Placemark::WriteExp {{{*/ void KML_Placemark::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Placemark.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Placemark.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Placemark.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -23,9 +23,9 @@ DataSet* geometry; - /*KML_Placemark constructors, destructors {{{1*/ + /*KML_Placemark constructors, destructors {{{*/ KML_Placemark(); ~KML_Placemark(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Point.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Point.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Point.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -22,5 +22,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Point::KML_Point(){{{1*/ +/*FUNCTION KML_Point::KML_Point(){{{*/ KML_Point::KML_Point(){ @@ -34,5 +34,5 @@ } /*}}}*/ -/*FUNCTION KML_Point::~KML_Point(){{{1*/ +/*FUNCTION KML_Point::~KML_Point(){{{*/ KML_Point::~KML_Point(){ @@ -43,5 +43,5 @@ /*Other*/ -/*FUNCTION KML_Point::Echo {{{1*/ +/*FUNCTION KML_Point::Echo {{{*/ void KML_Point::Echo(){ @@ -58,5 +58,5 @@ } /*}}}*/ -/*FUNCTION KML_Point::DeepEcho {{{1*/ +/*FUNCTION KML_Point::DeepEcho {{{*/ void KML_Point::DeepEcho(){ @@ -68,5 +68,5 @@ } /*}}}*/ -/*FUNCTION KML_Point::DeepEcho {{{1*/ +/*FUNCTION KML_Point::DeepEcho {{{*/ void KML_Point::DeepEcho(const char* indent){ @@ -83,5 +83,5 @@ } /*}}}*/ -/*FUNCTION KML_Point::Write {{{1*/ +/*FUNCTION KML_Point::Write {{{*/ void KML_Point::Write(FILE* filout,const char* indent){ @@ -103,5 +103,5 @@ } /*}}}*/ -/*FUNCTION KML_Point::Read {{{1*/ +/*FUNCTION KML_Point::Read {{{*/ void KML_Point::Read(FILE* fid,char* kstr){ @@ -158,5 +158,5 @@ } /*}}}*/ -/*FUNCTION KML_Point::WriteExp {{{1*/ +/*FUNCTION KML_Point::WriteExp {{{*/ void KML_Point::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Point.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Point.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Point.h (revision 12365) @@ -9,5 +9,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -25,9 +25,9 @@ double coords[3]; - /*KML_Point constructors, destructors {{{1*/ + /*KML_Point constructors, destructors {{{*/ KML_Point(); ~KML_Point(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_PolyStyle::KML_PolyStyle(){{{1*/ +/*FUNCTION KML_PolyStyle::KML_PolyStyle(){{{*/ KML_PolyStyle::KML_PolyStyle(){ @@ -29,5 +29,5 @@ } /*}}}*/ -/*FUNCTION KML_PolyStyle::~KML_PolyStyle(){{{1*/ +/*FUNCTION KML_PolyStyle::~KML_PolyStyle(){{{*/ KML_PolyStyle::~KML_PolyStyle(){ @@ -38,5 +38,5 @@ /*Other*/ -/*FUNCTION KML_PolyStyle::Echo {{{1*/ +/*FUNCTION KML_PolyStyle::Echo {{{*/ void KML_PolyStyle::Echo(){ @@ -53,5 +53,5 @@ /*}}}*/ -/*FUNCTION KML_PolyStyle::DeepEcho {{{1*/ +/*FUNCTION KML_PolyStyle::DeepEcho {{{*/ void KML_PolyStyle::DeepEcho(){ @@ -64,5 +64,5 @@ /*}}}*/ -/*FUNCTION KML_PolyStyle::DeepEcho {{{1*/ +/*FUNCTION KML_PolyStyle::DeepEcho {{{*/ void KML_PolyStyle::DeepEcho(const char* indent){ @@ -80,5 +80,5 @@ /*}}}*/ -/*FUNCTION KML_PolyStyle::Write {{{1*/ +/*FUNCTION KML_PolyStyle::Write {{{*/ void KML_PolyStyle::Write(FILE* filout,const char* indent){ @@ -99,5 +99,5 @@ /*}}}*/ -/*FUNCTION KML_PolyStyle::Read {{{1*/ +/*FUNCTION KML_PolyStyle::Read {{{*/ void KML_PolyStyle::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_PolyStyle.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -22,9 +22,9 @@ int outline; - /*KML_PolyStyle constructors, destructors {{{1*/ + /*KML_PolyStyle constructors, destructors {{{*/ KML_PolyStyle(); ~KML_PolyStyle(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Polygon.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Polygon.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Polygon.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Polygon::KML_Polygon(){{{1*/ +/*FUNCTION KML_Polygon::KML_Polygon(){{{*/ KML_Polygon::KML_Polygon(){ @@ -33,5 +33,5 @@ } /*}}}*/ -/*FUNCTION KML_Polygon::~KML_Polygon(){{{1*/ +/*FUNCTION KML_Polygon::~KML_Polygon(){{{*/ KML_Polygon::~KML_Polygon(){ @@ -50,5 +50,5 @@ /*Other*/ -/*FUNCTION KML_Polygon::Echo {{{1*/ +/*FUNCTION KML_Polygon::Echo {{{*/ void KML_Polygon::Echo(){ @@ -67,5 +67,5 @@ } /*}}}*/ -/*FUNCTION KML_Polygon::DeepEcho {{{1*/ +/*FUNCTION KML_Polygon::DeepEcho {{{*/ void KML_Polygon::DeepEcho(){ @@ -77,5 +77,5 @@ } /*}}}*/ -/*FUNCTION KML_Polygon::DeepEcho {{{1*/ +/*FUNCTION KML_Polygon::DeepEcho {{{*/ void KML_Polygon::DeepEcho(const char* indent){ @@ -115,5 +115,5 @@ } /*}}}*/ -/*FUNCTION KML_Polygon::Write {{{1*/ +/*FUNCTION KML_Polygon::Write {{{*/ void KML_Polygon::Write(FILE* filout,const char* indent){ @@ -155,5 +155,5 @@ } /*}}}*/ -/*FUNCTION KML_Polygon::Read {{{1*/ +/*FUNCTION KML_Polygon::Read {{{*/ void KML_Polygon::Read(FILE* fid,char* kstr){ @@ -266,5 +266,5 @@ } /*}}}*/ -/*FUNCTION KML_Polygon::WriteExp {{{1*/ +/*FUNCTION KML_Polygon::WriteExp {{{*/ void KML_Polygon::WriteExp(FILE* fid,const char* nstr,int sgn,double cm,double sp){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Polygon.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Polygon.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Polygon.h (revision 12365) @@ -9,5 +9,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -29,9 +29,9 @@ DataSet* inner; - /*KML_Polygon constructors, destructors {{{1*/ + /*KML_Polygon constructors, destructors {{{*/ KML_Polygon(); ~KML_Polygon(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Style.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Style.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Style.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Style::KML_Style(){{{1*/ +/*FUNCTION KML_Style::KML_Style(){{{*/ KML_Style::KML_Style(){ @@ -33,5 +33,5 @@ } /*}}}*/ -/*FUNCTION KML_Style::~KML_Style(){{{1*/ +/*FUNCTION KML_Style::~KML_Style(){{{*/ KML_Style::~KML_Style(){ @@ -69,5 +69,5 @@ /*Other*/ -/*FUNCTION KML_Style::Echo {{{1*/ +/*FUNCTION KML_Style::Echo {{{*/ void KML_Style::Echo(){ @@ -88,5 +88,5 @@ /*}}}*/ -/*FUNCTION KML_Style::DeepEcho {{{1*/ +/*FUNCTION KML_Style::DeepEcho {{{*/ void KML_Style::DeepEcho(){ @@ -99,5 +99,5 @@ /*}}}*/ -/*FUNCTION KML_Style::DeepEcho {{{1*/ +/*FUNCTION KML_Style::DeepEcho {{{*/ void KML_Style::DeepEcho(const char* indent){ @@ -140,5 +140,5 @@ /*}}}*/ -/*FUNCTION KML_Style::Write {{{1*/ +/*FUNCTION KML_Style::Write {{{*/ void KML_Style::Write(FILE* filout,const char* indent){ @@ -175,5 +175,5 @@ /*}}}*/ -/*FUNCTION KML_Style::Read {{{1*/ +/*FUNCTION KML_Style::Read {{{*/ void KML_Style::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Style.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Style.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Style.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -28,9 +28,9 @@ void* list; - /*KML_Style constructors, destructors {{{1*/ + /*KML_Style constructors, destructors {{{*/ KML_Style(); ~KML_Style(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_StyleSelector.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_StyleSelector.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_StyleSelector.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -20,5 +20,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_StyleSelector::KML_StyleSelector(){{{1*/ +/*FUNCTION KML_StyleSelector::KML_StyleSelector(){{{*/ KML_StyleSelector::KML_StyleSelector(){ @@ -27,5 +27,5 @@ } /*}}}*/ -/*FUNCTION KML_StyleSelector::~KML_StyleSelector(){{{1*/ +/*FUNCTION KML_StyleSelector::~KML_StyleSelector(){{{*/ KML_StyleSelector::~KML_StyleSelector(){ @@ -36,5 +36,5 @@ /*Other*/ -/*FUNCTION KML_StyleSelector::Echo {{{1*/ +/*FUNCTION KML_StyleSelector::Echo {{{*/ void KML_StyleSelector::Echo(){ @@ -45,5 +45,5 @@ /*}}}*/ -/*FUNCTION KML_StyleSelector::DeepEcho {{{1*/ +/*FUNCTION KML_StyleSelector::DeepEcho {{{*/ void KML_StyleSelector::DeepEcho(){ @@ -56,5 +56,5 @@ /*}}}*/ -/*FUNCTION KML_StyleSelector::DeepEcho {{{1*/ +/*FUNCTION KML_StyleSelector::DeepEcho {{{*/ void KML_StyleSelector::DeepEcho(const char* indent){ @@ -65,5 +65,5 @@ /*}}}*/ -/*FUNCTION KML_StyleSelector::Write {{{1*/ +/*FUNCTION KML_StyleSelector::Write {{{*/ void KML_StyleSelector::Write(FILE* filout,const char* indent){ @@ -74,5 +74,5 @@ /*}}}*/ -/*FUNCTION KML_StyleSelector::Read {{{1*/ +/*FUNCTION KML_StyleSelector::Read {{{*/ void KML_StyleSelector::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_StyleSelector.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_StyleSelector.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_StyleSelector.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -19,9 +19,9 @@ public: - /*KML_StyleSelector constructors, destructors {{{1*/ + /*KML_StyleSelector constructors, destructors {{{*/ KML_StyleSelector(); ~KML_StyleSelector(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_SubStyle.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_SubStyle.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_SubStyle.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -20,5 +20,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_SubStyle::KML_SubStyle(){{{1*/ +/*FUNCTION KML_SubStyle::KML_SubStyle(){{{*/ KML_SubStyle::KML_SubStyle(){ @@ -27,5 +27,5 @@ } /*}}}*/ -/*FUNCTION KML_SubStyle::~KML_SubStyle(){{{1*/ +/*FUNCTION KML_SubStyle::~KML_SubStyle(){{{*/ KML_SubStyle::~KML_SubStyle(){ @@ -36,5 +36,5 @@ /*Other*/ -/*FUNCTION KML_SubStyle::Echo {{{1*/ +/*FUNCTION KML_SubStyle::Echo {{{*/ void KML_SubStyle::Echo(){ @@ -45,5 +45,5 @@ /*}}}*/ -/*FUNCTION KML_SubStyle::DeepEcho {{{1*/ +/*FUNCTION KML_SubStyle::DeepEcho {{{*/ void KML_SubStyle::DeepEcho(){ @@ -56,5 +56,5 @@ /*}}}*/ -/*FUNCTION KML_SubStyle::DeepEcho {{{1*/ +/*FUNCTION KML_SubStyle::DeepEcho {{{*/ void KML_SubStyle::DeepEcho(const char* indent){ @@ -65,5 +65,5 @@ /*}}}*/ -/*FUNCTION KML_SubStyle::Write {{{1*/ +/*FUNCTION KML_SubStyle::Write {{{*/ void KML_SubStyle::Write(FILE* filout,const char* indent){ @@ -74,5 +74,5 @@ /*}}}*/ -/*FUNCTION KML_SubStyle::Read {{{1*/ +/*FUNCTION KML_SubStyle::Read {{{*/ void KML_SubStyle::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_SubStyle.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_SubStyle.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_SubStyle.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -19,9 +19,9 @@ public: - /*KML_SubStyle constructors, destructors {{{1*/ + /*KML_SubStyle constructors, destructors {{{*/ KML_SubStyle(); ~KML_SubStyle(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION KML_Unknown::KML_Unknown(){{{1*/ +/*FUNCTION KML_Unknown::KML_Unknown(){{{*/ KML_Unknown::KML_Unknown(){ @@ -29,5 +29,5 @@ } /*}}}*/ -/*FUNCTION KML_Unknown::~KML_Unknown(){{{1*/ +/*FUNCTION KML_Unknown::~KML_Unknown(){{{*/ KML_Unknown::~KML_Unknown(){ @@ -39,5 +39,5 @@ /*Other*/ -/*FUNCTION KML_Unknown::Echo {{{1*/ +/*FUNCTION KML_Unknown::Echo {{{*/ void KML_Unknown::Echo(){ @@ -55,5 +55,5 @@ } /*}}}*/ -/*FUNCTION KML_Unknown::DeepEcho {{{1*/ +/*FUNCTION KML_Unknown::DeepEcho {{{*/ void KML_Unknown::DeepEcho(){ @@ -65,5 +65,5 @@ } /*}}}*/ -/*FUNCTION KML_Unknown::DeepEcho {{{1*/ +/*FUNCTION KML_Unknown::DeepEcho {{{*/ void KML_Unknown::DeepEcho(const char* indent){ @@ -95,5 +95,5 @@ } /*}}}*/ -/*FUNCTION KML_Unknown::Write {{{1*/ +/*FUNCTION KML_Unknown::Write {{{*/ void KML_Unknown::Write(FILE* filout,const char* indent){ @@ -127,5 +127,5 @@ } /*}}}*/ -/*FUNCTION KML_Unknown::Read {{{1*/ +/*FUNCTION KML_Unknown::Read {{{*/ void KML_Unknown::Read(FILE* fid,char* kstr){ Index: /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.h =================================================================== --- /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/KML/KML_Unknown.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -22,9 +22,9 @@ char* value; - /*KML_Unknown constructors, destructors {{{1*/ + /*KML_Unknown constructors, destructors {{{*/ KML_Unknown(); ~KML_Unknown(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/Kriging/ExponentialVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Kriging/ExponentialVariogram.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Kriging/ExponentialVariogram.cpp (revision 12365) @@ -17,5 +17,5 @@ /*ExponentialVariogram constructors and destructor*/ -/*FUNCTION ExponentialVariogram::ExponentialVariogram(){{{1*/ +/*FUNCTION ExponentialVariogram::ExponentialVariogram(){{{*/ ExponentialVariogram::ExponentialVariogram(){ this->nugget = 0.2; @@ -25,5 +25,5 @@ } /*}}}*/ -/*FUNCTION ExponentialVariogram::ExponentialVariogram(Options* options){{{1*/ +/*FUNCTION ExponentialVariogram::ExponentialVariogram(Options* options){{{*/ ExponentialVariogram::ExponentialVariogram(Options* options){ @@ -42,5 +42,5 @@ } /*}}}*/ -/*FUNCTION ExponentialVariogram::~ExponentialVariogram(){{{1*/ +/*FUNCTION ExponentialVariogram::~ExponentialVariogram(){{{*/ ExponentialVariogram::~ExponentialVariogram(){ return; @@ -49,5 +49,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION ExponentialVariogram::Echo {{{1*/ +/*FUNCTION ExponentialVariogram::Echo {{{*/ void ExponentialVariogram::Echo(void){ printf("ExponentialVariogram\n"); @@ -59,5 +59,5 @@ /*Variogram function*/ -/*FUNCTION ExponentialVariogram::Covariance{{{1*/ +/*FUNCTION ExponentialVariogram::Covariance{{{*/ double ExponentialVariogram::Covariance(double deltax,double deltay){ /*The covariance can be deduced from the variogram from the following @@ -77,5 +77,5 @@ } /*}}}*/ -/*FUNCTION ExponentialVariogram::SemiVariogram{{{1*/ +/*FUNCTION ExponentialVariogram::SemiVariogram{{{*/ double ExponentialVariogram::SemiVariogram(double deltax,double deltay){ /*http://en.wikipedia.org/wiki/Variogram*/ Index: /issm/trunk-jpl/src/c/objects/Kriging/GaussianVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Kriging/GaussianVariogram.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Kriging/GaussianVariogram.cpp (revision 12365) @@ -17,5 +17,5 @@ /*GaussianVariogram constructors and destructor*/ -/*FUNCTION GaussianVariogram::GaussianVariogram(){{{1*/ +/*FUNCTION GaussianVariogram::GaussianVariogram(){{{*/ GaussianVariogram::GaussianVariogram(){ this->nugget = 0.2; @@ -25,5 +25,5 @@ } /*}}}*/ -/*FUNCTION GaussianVariogram::GaussianVariogram(Options* options){{{1*/ +/*FUNCTION GaussianVariogram::GaussianVariogram(Options* options){{{*/ GaussianVariogram::GaussianVariogram(Options* options){ @@ -42,5 +42,5 @@ } /*}}}*/ -/*FUNCTION GaussianVariogram::~GaussianVariogram(){{{1*/ +/*FUNCTION GaussianVariogram::~GaussianVariogram(){{{*/ GaussianVariogram::~GaussianVariogram(){ return; @@ -49,5 +49,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION GaussianVariogram::Echo {{{1*/ +/*FUNCTION GaussianVariogram::Echo {{{*/ void GaussianVariogram::Echo(void){ printf("GaussianVariogram\n"); @@ -59,5 +59,5 @@ /*Variogram function*/ -/*FUNCTION GaussianVariogram::Covariance{{{1*/ +/*FUNCTION GaussianVariogram::Covariance{{{*/ double GaussianVariogram::Covariance(double deltax,double deltay){ /*The covariance can be deduced from the variogram from the following @@ -80,5 +80,5 @@ } /*}}}*/ -/*FUNCTION GaussianVariogram::SemiVariogram{{{1*/ +/*FUNCTION GaussianVariogram::SemiVariogram{{{*/ double GaussianVariogram::SemiVariogram(double deltax,double deltay){ /*http://en.wikipedia.org/wiki/Variogram*/ Index: /issm/trunk-jpl/src/c/objects/Kriging/Observation.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Kriging/Observation.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Kriging/Observation.cpp (revision 12365) @@ -7,10 +7,10 @@ /*Observation constructors and destructor*/ -/*FUNCTION Observation::Observation(){{{1*/ +/*FUNCTION Observation::Observation(){{{*/ Observation::Observation(){ return; } /*}}}*/ -/*FUNCTION Observation::Observation(double x,double y,int xi,int yi,int index,double value){{{1*/ +/*FUNCTION Observation::Observation(double x,double y,int xi,int yi,int index,double value){{{*/ Observation::Observation(double x_in,double y_in,int xi_in,int yi_in,int index_in,double value_in){ @@ -25,5 +25,5 @@ } /*}}}*/ -/*FUNCTION Observation::~Observation(){{{1*/ +/*FUNCTION Observation::~Observation(){{{*/ Observation::~Observation(){ return; @@ -32,5 +32,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION Observation::Echo {{{1*/ +/*FUNCTION Observation::Echo {{{*/ void Observation::Echo(void){ @@ -49,5 +49,5 @@ /*Observations functions*/ -/*FUNCTION Observation::WriteXYObs(double* px,double* py,double* pobs){{{1*/ +/*FUNCTION Observation::WriteXYObs(double* px,double* py,double* pobs){{{*/ void Observation::WriteXYObs(double* px,double* py,double* pobs){ *px = this->x; Index: /issm/trunk-jpl/src/c/objects/Kriging/PowerVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Kriging/PowerVariogram.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Kriging/PowerVariogram.cpp (revision 12365) @@ -17,5 +17,5 @@ /*PowerVariogram constructors and destructor*/ -/*FUNCTION PowerVariogram::PowerVariogram(){{{1*/ +/*FUNCTION PowerVariogram::PowerVariogram(){{{*/ PowerVariogram::PowerVariogram(){ this->nugget = 0.2; @@ -25,5 +25,5 @@ } /*}}}*/ -/*FUNCTION PowerVariogram::PowerVariogram(Options* options){{{1*/ +/*FUNCTION PowerVariogram::PowerVariogram(Options* options){{{*/ PowerVariogram::PowerVariogram(Options* options){ @@ -43,5 +43,5 @@ } /*}}}*/ -/*FUNCTION PowerVariogram::~PowerVariogram(){{{1*/ +/*FUNCTION PowerVariogram::~PowerVariogram(){{{*/ PowerVariogram::~PowerVariogram(){ return; @@ -50,5 +50,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION PowerVariogram::Echo {{{1*/ +/*FUNCTION PowerVariogram::Echo {{{*/ void PowerVariogram::Echo(void){ printf("PowerVariogram\n"); @@ -60,5 +60,5 @@ /*Variogram function*/ -/*FUNCTION PowerVariogram::Covariance{{{1*/ +/*FUNCTION PowerVariogram::Covariance{{{*/ double PowerVariogram::Covariance(double deltax,double deltay){ /*The covariance can be deduced from the variogram from the following @@ -78,5 +78,5 @@ } /*}}}*/ -/*FUNCTION PowerVariogram::SemiVariogram{{{1*/ +/*FUNCTION PowerVariogram::SemiVariogram{{{*/ double PowerVariogram::SemiVariogram(double deltax,double deltay){ /*http://en.wikipedia.org/wiki/Variogram*/ Index: /issm/trunk-jpl/src/c/objects/Kriging/Quadtree.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Kriging/Quadtree.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Kriging/Quadtree.cpp (revision 12365) @@ -1,4 +1,4 @@ #include "../objects.h" -/*DOCUMENTATION What is a Quadtree? {{{1 +/*DOCUMENTATION What is a Quadtree? {{{ * A Quadtree is a very simple way to group vertices according * to their locations. A square that holds all the points of the mesh @@ -46,6 +46,6 @@ * Using binaries is therefore very easy to locate a vertex in a box: * we just need to look at the bits from the left to the right (See ::Add) - }}}1*/ -/*MACROS {{{1*/ + }}}*/ +/*MACROS {{{*/ /* * @@ -80,11 +80,11 @@ /*Constructors/Destructors*/ -/*FUNCTION Quadtree::Quadtree(){{{1*/ +/*FUNCTION Quadtree::Quadtree(){{{*/ Quadtree::Quadtree(){ _error_("Constructor not supported"); } -/*}}}1*/ -/*FUNCTION Quadtree::Quadtree(double xmin,double xmax,double ymin,double ymax,int maxdepth){{{1*/ +/*}}}*/ +/*FUNCTION Quadtree::Quadtree(double xmin,double xmax,double ymin,double ymax,int maxdepth){{{*/ Quadtree::Quadtree(double xmin,double xmax,double ymin,double ymax,int maxdepth){ @@ -104,6 +104,6 @@ this->root=NewQuadtreeBox(xmin+length/2,ymin+length/2,length); } -/*}}}1*/ - /*FUNCTION Quadtree::~Quadtree(){{{1*/ +/*}}}*/ + /*FUNCTION Quadtree::~Quadtree(){{{*/ Quadtree::~Quadtree(){ @@ -112,8 +112,8 @@ } - /*}}}1*/ + /*}}}*/ /*Methods*/ -/*FUNCTION Quadtree::Add{{{1*/ +/*FUNCTION Quadtree::Add{{{*/ void Quadtree::Add(Observation* observation){ @@ -198,5 +198,5 @@ }/*}}}*/ -/*FUNCTION Quadtree::AddAndAverage{{{1*/ +/*FUNCTION Quadtree::AddAndAverage{{{*/ void Quadtree::AddAndAverage(double x,double y,double value){ @@ -250,5 +250,5 @@ } }/*}}}*/ -/*FUNCTION Quadtree::ClosestObs{{{1*/ +/*FUNCTION Quadtree::ClosestObs{{{*/ void Quadtree::ClosestObs(int *pindex,double x,double y){ @@ -293,5 +293,5 @@ *pindex=index; }/*}}}*/ -/*FUNCTION Quadtree::Echo{{{1*/ +/*FUNCTION Quadtree::Echo{{{*/ void Quadtree::Echo(void){ @@ -303,5 +303,5 @@ }/*}}}*/ -/*FUNCTION Quadtree::DeepEcho{{{1*/ +/*FUNCTION Quadtree::DeepEcho{{{*/ void Quadtree::DeepEcho(void){ @@ -314,5 +314,5 @@ }/*}}}*/ -/*FUNCTION Quadtree::IntergerCoordinates{{{1*/ +/*FUNCTION Quadtree::IntergerCoordinates{{{*/ void Quadtree::IntergerCoordinates(int *xi,int *yi,double x,double y){ @@ -338,5 +338,5 @@ *yi=int(coefficient*(y - ymin)); }/*}}}*/ -/*FUNCTION Quadtree::NewQuadtreeBox(double xcenter,double ycenter,double length){{{1*/ +/*FUNCTION Quadtree::NewQuadtreeBox(double xcenter,double ycenter,double length){{{*/ Quadtree::QuadtreeBox* Quadtree::NewQuadtreeBox(double xcenter,double ycenter,double length){ @@ -362,5 +362,5 @@ return newbox; }/*}}}*/ -/*FUNCTION Quadtree::NewQuadtreeBox(QuadtreeBox* master,int index) {{{1*/ +/*FUNCTION Quadtree::NewQuadtreeBox(QuadtreeBox* master,int index) {{{*/ Quadtree::QuadtreeBox* Quadtree::NewQuadtreeBox(QuadtreeBox* master,int index){ @@ -407,5 +407,5 @@ return newbox; }/*}}}*/ -/*FUNCTION Quadtree::QuadtreeDepth{{{1*/ +/*FUNCTION Quadtree::QuadtreeDepth{{{*/ void Quadtree::QuadtreeDepth(int* A,int xi,int yi){ @@ -435,5 +435,5 @@ *A=level; }/*}}}*/ -/*FUNCTION Quadtree::QuadtreeDepth2{{{1*/ +/*FUNCTION Quadtree::QuadtreeDepth2{{{*/ void Quadtree::QuadtreeDepth2(int* A,int xi,int yi){ @@ -488,5 +488,5 @@ *A=level; }/*}}}*/ -/*FUNCTION Quadtree::RangeSearch{{{1*/ +/*FUNCTION Quadtree::RangeSearch{{{*/ void Quadtree::RangeSearch(int **pindices,int *pnobs,double x,double y,double range){ @@ -508,5 +508,5 @@ /*QuadtreeBox methos*/ -/*FUNCTION QuadtreeBox::Echo{{{1*/ +/*FUNCTION QuadtreeBox::Echo{{{*/ void Quadtree::QuadtreeBox::Echo(void){ @@ -518,5 +518,5 @@ }/*}}}*/ -/*FUNCTION QuadtreeBox::IsWithinRange{{{1*/ +/*FUNCTION QuadtreeBox::IsWithinRange{{{*/ int Quadtree::QuadtreeBox::IsWithinRange(double x,double y,double range){ @@ -537,5 +537,5 @@ }/*}}}*/ -/*FUNCTION QuadtreeBox::RangeSearch{{{1*/ +/*FUNCTION QuadtreeBox::RangeSearch{{{*/ void Quadtree::QuadtreeBox::RangeSearch(int* indices,int *pnobs,double x,double y,double range){ @@ -579,5 +579,5 @@ *pnobs=nobs; }/*}}}*/ -/*FUNCTION QuadtreeBox::WriteObservations{{{1*/ +/*FUNCTION QuadtreeBox::WriteObservations{{{*/ void Quadtree::QuadtreeBox::WriteObservations(int* indices,int *pnobs){ Index: /issm/trunk-jpl/src/c/objects/Kriging/SphericalVariogram.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Kriging/SphericalVariogram.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Kriging/SphericalVariogram.cpp (revision 12365) @@ -17,5 +17,5 @@ /*SphericalVariogram constructors and destructor*/ -/*FUNCTION SphericalVariogram::SphericalVariogram(){{{1*/ +/*FUNCTION SphericalVariogram::SphericalVariogram(){{{*/ SphericalVariogram::SphericalVariogram(){ this->nugget = 0.2; @@ -25,5 +25,5 @@ } /*}}}*/ -/*FUNCTION SphericalVariogram::SphericalVariogram(Options* options){{{1*/ +/*FUNCTION SphericalVariogram::SphericalVariogram(Options* options){{{*/ SphericalVariogram::SphericalVariogram(Options* options){ @@ -42,5 +42,5 @@ } /*}}}*/ -/*FUNCTION SphericalVariogram::~SphericalVariogram(){{{1*/ +/*FUNCTION SphericalVariogram::~SphericalVariogram(){{{*/ SphericalVariogram::~SphericalVariogram(){ return; @@ -49,5 +49,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION SphericalVariogram::Echo {{{1*/ +/*FUNCTION SphericalVariogram::Echo {{{*/ void SphericalVariogram::Echo(void){ printf("SphericalVariogram\n"); @@ -59,5 +59,5 @@ /*Variogram function*/ -/*FUNCTION SphericalVariogram::Covariance{{{1*/ +/*FUNCTION SphericalVariogram::Covariance{{{*/ double SphericalVariogram::Covariance(double deltax,double deltay){ /*The covariance can be deduced from the variogram from the following @@ -80,5 +80,5 @@ } /*}}}*/ -/*FUNCTION SphericalVariogram::SemiVariogram{{{1*/ +/*FUNCTION SphericalVariogram::SemiVariogram{{{*/ double SphericalVariogram::SemiVariogram(double deltax,double deltay){ /*http://en.wikipedia.org/wiki/Variogram*/ Index: /issm/trunk-jpl/src/c/objects/Loads/Friction.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Friction.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Friction.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructors*/ -/*FUNCTION Friction::Friction() {{{1*/ +/*FUNCTION Friction::Friction() {{{*/ Friction::Friction(){ this->element_type=NULL; @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION Friction::Friction(const char* element_type, Inputs* inputs,Matpar* matpar,int analysis_type){{{1*/ +/*FUNCTION Friction::Friction(const char* element_type, Inputs* inputs,Matpar* matpar,int analysis_type){{{*/ Friction::Friction(const char* element_type_in,Inputs* inputs_in,Matpar* matpar_in, int in_analysis_type){ @@ -39,5 +39,5 @@ } /*}}}*/ -/*FUNCTION Friction::~Friction() {{{1*/ +/*FUNCTION Friction::~Friction() {{{*/ Friction::~Friction(){ xfree((void**)&element_type); @@ -46,5 +46,5 @@ /*methods: */ -/*FUNCTION Friction::Echo {{{1*/ +/*FUNCTION Friction::Echo {{{*/ void Friction::Echo(void){ printf("Friction:\n"); @@ -55,5 +55,5 @@ } /*}}}*/ -/*FUNCTION Friction::GetAlpha2(double* palpha2, GaussTria* gauss,int vxenum,int vyenum,int vzenum){{{1*/ +/*FUNCTION Friction::GetAlpha2(double* palpha2, GaussTria* gauss,int vxenum,int vyenum,int vzenum){{{*/ void Friction::GetAlpha2(double* palpha2, GaussTria* gauss,int vxenum,int vyenum,int vzenum){ @@ -119,5 +119,5 @@ } /*}}}*/ -/*FUNCTION Friction::GetAlpha2(double* palpha2, GaussPenta* gauss,int vxenum,int vyenum,int vzenum){{{1*/ +/*FUNCTION Friction::GetAlpha2(double* palpha2, GaussPenta* gauss,int vxenum,int vyenum,int vzenum){{{*/ void Friction::GetAlpha2(double* palpha2, GaussPenta* gauss,int vxenum,int vyenum,int vzenum){ @@ -183,5 +183,5 @@ } /*}}}*/ -/*FUNCTION Friction::GetAlphaComplement(double* palpha_complement, GaussTria* gauss,int vxenum,int vyenum,int vzenum) {{{1*/ +/*FUNCTION Friction::GetAlphaComplement(double* palpha_complement, GaussTria* gauss,int vxenum,int vyenum,int vzenum) {{{*/ void Friction::GetAlphaComplement(double* palpha_complement, GaussTria* gauss,int vxenum,int vyenum,int vzenum){ @@ -249,5 +249,5 @@ } /*}}}*/ -/*FUNCTION Friction::GetAlphaComplement(double* palpha_complement, GaussPenta* gauss,int vxenum,int vyenum,int vzenum) {{{1*/ +/*FUNCTION Friction::GetAlphaComplement(double* palpha_complement, GaussPenta* gauss,int vxenum,int vyenum,int vzenum) {{{*/ void Friction::GetAlphaComplement(double* palpha_complement, GaussPenta* gauss,int vxenum,int vyenum,int vzenum){ @@ -315,5 +315,5 @@ } /*}}}*/ -/*FUNCTION Friction::GetInputValue{{{1*/ +/*FUNCTION Friction::GetInputValue{{{*/ void Friction::GetInputValue(double* pvalue,GaussTria* gauss,int enum_type){ @@ -324,5 +324,5 @@ } /*}}}*/ -/*FUNCTION Friction::GetInputValue{{{1*/ +/*FUNCTION Friction::GetInputValue{{{*/ void Friction::GetInputValue(double* pvalue,GaussPenta* gauss,int enum_type){ Index: /issm/trunk-jpl/src/c/objects/Loads/Friction.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Friction.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Friction.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ class Inputs; class Matpar; Index: /issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Icefront.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -24,5 +24,5 @@ /*Icefront constructors and destructor*/ -/*FUNCTION Icefront::Icefront() {{{1*/ +/*FUNCTION Icefront::Icefront() {{{*/ Icefront::Icefront(){ @@ -38,5 +38,5 @@ } /*}}}*/ -/*FUNCTION Icefront::Icefront(int id, int i, IoModel* iomodel,int analysis_type) {{{1*/ +/*FUNCTION Icefront::Icefront(int id, int i, IoModel* iomodel,int analysis_type) {{{*/ Icefront::Icefront(int icefront_id,int i, IoModel* iomodel,int in_icefront_type, int in_analysis_type){ @@ -114,5 +114,5 @@ /*}}}*/ -/*FUNCTION Icefront::~Icefront() {{{1*/ +/*FUNCTION Icefront::~Icefront() {{{*/ Icefront::~Icefront(){ delete inputs; @@ -125,5 +125,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION Icefront::Echo {{{1*/ +/*FUNCTION Icefront::Echo {{{*/ void Icefront::Echo(void){ printf("Icefront:\n"); @@ -139,5 +139,5 @@ } /*}}}*/ -/*FUNCTION Icefront::DeepEcho{{{1*/ +/*FUNCTION Icefront::DeepEcho{{{*/ void Icefront::DeepEcho(void){ @@ -154,8 +154,8 @@ } /*}}}*/ -/*FUNCTION Icefront::Id {{{1*/ +/*FUNCTION Icefront::Id {{{*/ int Icefront::Id(void){ return id; } /*}}}*/ -/*FUNCTION Icefront::MyRank {{{1*/ +/*FUNCTION Icefront::MyRank {{{*/ int Icefront::MyRank(void){ extern int my_rank; @@ -163,5 +163,5 @@ } /*}}}*/ -/*FUNCTION Icefront::ObjectEnum{{{1*/ +/*FUNCTION Icefront::ObjectEnum{{{*/ int Icefront::ObjectEnum(void){ @@ -170,5 +170,5 @@ } /*}}}*/ -/*FUNCTION Icefront::copy {{{1*/ +/*FUNCTION Icefront::copy {{{*/ Object* Icefront::copy() { @@ -205,5 +205,5 @@ /*Load virtual functions definitions:*/ -/*FUNCTION Icefront::Configure {{{1*/ +/*FUNCTION Icefront::Configure {{{*/ void Icefront::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ @@ -223,9 +223,9 @@ } /*}}}*/ -/*FUNCTION Icefront::SetCurrentConfiguration {{{1*/ +/*FUNCTION Icefront::SetCurrentConfiguration {{{*/ void Icefront::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ } /*}}}*/ -/*FUNCTION Icefront::CreateKMatrix {{{1*/ +/*FUNCTION Icefront::CreateKMatrix {{{*/ void Icefront::CreateKMatrix(Matrix* Kff, Matrix* Kfs){ @@ -235,9 +235,9 @@ } /*}}}*/ -/*FUNCTION Icefront::CreatePVector {{{1*/ +/*FUNCTION Icefront::CreatePVector {{{*/ void Icefront::CreatePVector(Vector* pf){ /*Checks in debugging mode*/ - /*{{{2*/ + /*{{{*/ _assert_(nodes); _assert_(element); @@ -273,10 +273,10 @@ } /*}}}*/ -/*FUNCTION Icefront::CreateJacobianMatrix{{{1*/ +/*FUNCTION Icefront::CreateJacobianMatrix{{{*/ void Icefront::CreateJacobianMatrix(Matrix* Jff){ this->CreateKMatrix(Jff,NULL); } -/*}}}1*/ -/*FUNCTION Icefront::PenaltyCreateKMatrix {{{1*/ +/*}}}*/ +/*FUNCTION Icefront::PenaltyCreateKMatrix {{{*/ void Icefront::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs, double kmax){ /*do nothing: */ @@ -284,5 +284,5 @@ } /*}}}*/ -/*FUNCTION Icefront::PenaltyCreatePVector{{{1*/ +/*FUNCTION Icefront::PenaltyCreatePVector{{{*/ void Icefront::PenaltyCreatePVector(Vector* pf,double kmax){ /*do nothing: */ @@ -290,10 +290,10 @@ } /*}}}*/ -/*FUNCTION Icefront::PenaltyCreateJacobianMatrix{{{1*/ +/*FUNCTION Icefront::PenaltyCreateJacobianMatrix{{{*/ void Icefront::PenaltyCreateJacobianMatrix(Matrix* Jff,double kmax){ this->PenaltyCreateKMatrix(Jff,NULL,kmax); } -/*}}}1*/ -/*FUNCTION Icefront::InAnalysis{{{1*/ +/*}}}*/ +/*FUNCTION Icefront::InAnalysis{{{*/ bool Icefront::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type)return true; @@ -303,55 +303,55 @@ /*Update virtual functions definitions:*/ -/*FUNCTION Icefront::InputUpdateFromVector(double* vector, int name, int type) {{{1*/ +/*FUNCTION Icefront::InputUpdateFromVector(double* vector, int name, int type) {{{*/ void Icefront::InputUpdateFromVector(double* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::InputUpdateFromVector(int* vector, int name, int type) {{{1*/ +/*FUNCTION Icefront::InputUpdateFromVector(int* vector, int name, int type) {{{*/ void Icefront::InputUpdateFromVector(int* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/ +/*FUNCTION Icefront::InputUpdateFromVector(bool* vector, int name, int type) {{{*/ void Icefront::InputUpdateFromVector(bool* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type) {{{1*/ +/*FUNCTION Icefront::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type) {{{*/ void Icefront::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/ +/*FUNCTION Icefront::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{*/ void Icefront::InputUpdateFromVectorDakota(double* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/ +/*FUNCTION Icefront::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{*/ void Icefront::InputUpdateFromVectorDakota(int* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/ +/*FUNCTION Icefront::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{*/ void Icefront::InputUpdateFromVectorDakota(bool* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::InputUpdateFromConstant(double constant, int name) {{{1*/ +/*FUNCTION Icefront::InputUpdateFromConstant(double constant, int name) {{{*/ void Icefront::InputUpdateFromConstant(double constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::InputUpdateFromConstant(int constant, int name) {{{1*/ +/*FUNCTION Icefront::InputUpdateFromConstant(int constant, int name) {{{*/ void Icefront::InputUpdateFromConstant(int constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::InputUpdateFromConstant(bool constant, int name) {{{1*/ +/*FUNCTION Icefront::InputUpdateFromConstant(bool constant, int name) {{{*/ void Icefront::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Icefront::InputUpdateFromSolution{{{1*/ +/*FUNCTION Icefront::InputUpdateFromSolution{{{*/ void Icefront::InputUpdateFromSolution(double* solution){ /*Nothing updated yet*/ @@ -361,5 +361,5 @@ /*Icefront numerics: */ #ifdef _HAVE_DIAGNOSTIC_ -/*FUNCTION Icefront::CreatePVectorDiagnosticHoriz {{{1*/ +/*FUNCTION Icefront::CreatePVectorDiagnosticHoriz {{{*/ ElementVector* Icefront::CreatePVectorDiagnosticHoriz(void){ @@ -383,5 +383,5 @@ } /*}}}*/ -/*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal2d{{{1*/ +/*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal2d{{{*/ ElementVector* Icefront::CreatePVectorDiagnosticMacAyeal2d(void){ @@ -467,5 +467,5 @@ #ifdef _HAVE_CONTROL_ -/*FUNCTION Icefront::CreatePVectorAdjointHoriz {{{1*/ +/*FUNCTION Icefront::CreatePVectorAdjointHoriz {{{*/ ElementVector* Icefront::CreatePVectorAdjointHoriz(void){ @@ -476,5 +476,5 @@ #endif #ifdef _HAVE_3D_ -/*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal3d{{{1*/ +/*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal3d{{{*/ ElementVector* Icefront::CreatePVectorDiagnosticMacAyeal3d(void){ @@ -504,5 +504,5 @@ } /*}}}*/ -/*FUNCTION Icefront::CreatePVectorDiagnosticPattyn{{{1*/ +/*FUNCTION Icefront::CreatePVectorDiagnosticPattyn{{{*/ ElementVector* Icefront::CreatePVectorDiagnosticPattyn(void){ @@ -581,5 +581,5 @@ } /*}}}*/ -/*FUNCTION Icefront::CreatePVectorDiagnosticStokes{{{1*/ +/*FUNCTION Icefront::CreatePVectorDiagnosticStokes{{{*/ ElementVector* Icefront::CreatePVectorDiagnosticStokes(void){ @@ -660,5 +660,5 @@ /*}}}*/ #endif -/*FUNCTION Icefront::GetDofList {{{1*/ +/*FUNCTION Icefront::GetDofList {{{*/ void Icefront::GetDofList(int** pdoflist,int approximation_enum,int setenum){ @@ -704,5 +704,5 @@ } /*}}}*/ -/*FUNCTION Icefront::GetSegmentNormal {{{1*/ +/*FUNCTION Icefront::GetSegmentNormal {{{*/ void Icefront:: GetSegmentNormal(double* normal,double xyz_list[4][3]){ @@ -721,5 +721,5 @@ } /*}}}*/ -/*FUNCTION Icefront::GetQuadNormal {{{1*/ +/*FUNCTION Icefront::GetQuadNormal {{{*/ void Icefront:: GetQuadNormal(double* normal,double xyz_list[4][3]){ Index: /issm/trunk-jpl/src/c/objects/Loads/Icefront.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Icefront.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Icefront.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Load.h" class Hook; @@ -39,10 +39,10 @@ Parameters* parameters; - /*Icefront constructors, destructors: {{{1*/ + /*Icefront constructors, destructors: {{{*/ Icefront(); Icefront(int icefront_id,int i, IoModel* iomodel,int in_icefront_type, int analysis_type); ~Icefront(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -52,5 +52,5 @@ Object* copy(); /*}}}*/ - /*Update virtual functions definitions: {{{1*/ + /*Update virtual functions definitions: {{{*/ void InputUpdateFromVector(double* vector, int name, int type); void InputUpdateFromVector(int* vector, int name, int type); @@ -66,5 +66,5 @@ void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; /*}}}*/ - /*Load virtual functions definitions: {{{1*/ + /*Load virtual functions definitions: {{{*/ void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); @@ -77,5 +77,5 @@ bool InAnalysis(int analysis_type); /*}}}*/ - /*Load management: {{{1*/ + /*Load management: {{{*/ void GetDofList(int** pdoflist,int approximation_enum,int setenum); void GetSegmentNormal(double* normal,double xyz_list[2][3]); Index: /issm/trunk-jpl/src/c/objects/Loads/Load.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Load.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Load.h (revision 12365) @@ -10,5 +10,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ class Object; class Matrix; @@ -26,5 +26,5 @@ virtual ~Load(){}; - /*Virtual functions: {{{1*/ + /*Virtual functions: {{{*/ virtual void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0; virtual void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters)=0; Index: /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -24,5 +24,5 @@ /*Numericalflux constructors and destructor*/ -/*FUNCTION Numericalflux::Numericalflux(){{{1*/ +/*FUNCTION Numericalflux::Numericalflux(){{{*/ Numericalflux::Numericalflux(){ this->inputs=NULL; @@ -34,5 +34,5 @@ } /*}}}*/ -/*}}}*//*FUNCTION Numericalflux::Numericalflux(int id, int i, IoModel* iomodel, int analysis_type) {{{1*/ +/*}}}*//*FUNCTION Numericalflux::Numericalflux(int id, int i, IoModel* iomodel, int analysis_type) {{{*/ Numericalflux::Numericalflux(int numericalflux_id,int i, IoModel* iomodel, int in_analysis_type){ @@ -139,5 +139,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::~Numericalflux(){{{1*/ +/*FUNCTION Numericalflux::~Numericalflux(){{{*/ Numericalflux::~Numericalflux(){ delete inputs; @@ -149,5 +149,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION Numericalflux::Echo {{{1*/ +/*FUNCTION Numericalflux::Echo {{{*/ void Numericalflux::Echo(void){ printf("Numericalflux:\n"); @@ -160,5 +160,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::DeepEcho {{{1*/ +/*FUNCTION Numericalflux::DeepEcho {{{*/ void Numericalflux::DeepEcho(void){ @@ -178,10 +178,10 @@ } /*}}}*/ -/*FUNCTION Numericalflux::Id {{{1*/ +/*FUNCTION Numericalflux::Id {{{*/ int Numericalflux::Id(void){ return id; } /*}}}*/ -/*FUNCTION Numericalflux::MyRank {{{1*/ +/*FUNCTION Numericalflux::MyRank {{{*/ int Numericalflux::MyRank(void){ extern int my_rank; @@ -189,5 +189,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::ObjectEnum{{{1*/ +/*FUNCTION Numericalflux::ObjectEnum{{{*/ int Numericalflux::ObjectEnum(void){ @@ -196,5 +196,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::copy {{{1*/ +/*FUNCTION Numericalflux::copy {{{*/ Object* Numericalflux::copy() { @@ -228,5 +228,5 @@ /*Load virtual functions definitions:*/ -/*FUNCTION Numericalflux::Configure {{{1*/ +/*FUNCTION Numericalflux::Configure {{{*/ void Numericalflux::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ @@ -245,10 +245,10 @@ } /*}}}*/ -/*FUNCTION Numericalflux::SetCurrentConfiguration {{{1*/ +/*FUNCTION Numericalflux::SetCurrentConfiguration {{{*/ void Numericalflux::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ } /*}}}*/ -/*FUNCTION Numericalflux::CreateKMatrix {{{1*/ +/*FUNCTION Numericalflux::CreateKMatrix {{{*/ void Numericalflux::CreateKMatrix(Matrix* Kff, Matrix* Kfs){ @@ -281,5 +281,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreatePVector {{{1*/ +/*FUNCTION Numericalflux::CreatePVector {{{*/ void Numericalflux::CreatePVector(Vector* pf){ @@ -311,5 +311,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::PenaltyCreateKMatrix {{{1*/ +/*FUNCTION Numericalflux::PenaltyCreateKMatrix {{{*/ void Numericalflux::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs,double kmax){ @@ -319,5 +319,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::PenaltyCreatePVector{{{1*/ +/*FUNCTION Numericalflux::PenaltyCreatePVector{{{*/ void Numericalflux::PenaltyCreatePVector(Vector* pf,double kmax){ @@ -327,5 +327,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::InAnalysis{{{1*/ +/*FUNCTION Numericalflux::InAnalysis{{{*/ bool Numericalflux::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type) return true; @@ -335,5 +335,5 @@ /*Numericalflux management*/ -/*FUNCTION Numericalflux::CreateKMatrixPrognostic{{{1*/ +/*FUNCTION Numericalflux::CreateKMatrixPrognostic{{{*/ ElementMatrix* Numericalflux::CreateKMatrixPrognostic(void){ @@ -351,5 +351,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreateKMatrixPrognosticInternal {{{1*/ +/*FUNCTION Numericalflux::CreateKMatrixPrognosticInternal {{{*/ ElementMatrix* Numericalflux::CreateKMatrixPrognosticInternal(void){ @@ -416,5 +416,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreateKMatrixPrognosticBoundary {{{1*/ +/*FUNCTION Numericalflux::CreateKMatrixPrognosticBoundary {{{*/ ElementMatrix* Numericalflux::CreateKMatrixPrognosticBoundary(void){ @@ -488,5 +488,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreateKMatrixBalancethickness{{{1*/ +/*FUNCTION Numericalflux::CreateKMatrixBalancethickness{{{*/ ElementMatrix* Numericalflux::CreateKMatrixBalancethickness(void){ @@ -504,5 +504,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreateKMatrixBalancethicknessInternal {{{1*/ +/*FUNCTION Numericalflux::CreateKMatrixBalancethicknessInternal {{{*/ ElementMatrix* Numericalflux::CreateKMatrixBalancethicknessInternal(void){ @@ -568,5 +568,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreateKMatrixBalancethicknessBoundary {{{1*/ +/*FUNCTION Numericalflux::CreateKMatrixBalancethicknessBoundary {{{*/ ElementMatrix* Numericalflux::CreateKMatrixBalancethicknessBoundary(void){ @@ -639,5 +639,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethickness{{{1*/ +/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethickness{{{*/ ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancethickness(void){ @@ -655,5 +655,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethicknessInternal {{{1*/ +/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethicknessInternal {{{*/ ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancethicknessInternal(void){ @@ -663,5 +663,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethicknessBoundary {{{1*/ +/*FUNCTION Numericalflux::CreateKMatrixAdjointBalancethicknessBoundary {{{*/ ElementMatrix* Numericalflux::CreateKMatrixAdjointBalancethicknessBoundary(void){ @@ -671,5 +671,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreatePVectorPrognostic{{{1*/ +/*FUNCTION Numericalflux::CreatePVectorPrognostic{{{*/ ElementVector* Numericalflux::CreatePVectorPrognostic(void){ @@ -687,5 +687,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreatePVectorPrognosticInternal{{{1*/ +/*FUNCTION Numericalflux::CreatePVectorPrognosticInternal{{{*/ ElementVector* Numericalflux::CreatePVectorPrognosticInternal(void){ @@ -695,5 +695,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreatePVectorPrognosticBoundary{{{1*/ +/*FUNCTION Numericalflux::CreatePVectorPrognosticBoundary{{{*/ ElementVector* Numericalflux::CreatePVectorPrognosticBoundary(void){ @@ -765,5 +765,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreatePVectorBalancethickness{{{1*/ +/*FUNCTION Numericalflux::CreatePVectorBalancethickness{{{*/ ElementVector* Numericalflux::CreatePVectorBalancethickness(void){ @@ -781,5 +781,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreatePVectorBalancethicknessInternal{{{1*/ +/*FUNCTION Numericalflux::CreatePVectorBalancethicknessInternal{{{*/ ElementVector* Numericalflux::CreatePVectorBalancethicknessInternal(void){ @@ -789,5 +789,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreatePVectorBalancethicknessBoundary{{{1*/ +/*FUNCTION Numericalflux::CreatePVectorBalancethicknessBoundary{{{*/ ElementVector* Numericalflux::CreatePVectorBalancethicknessBoundary(void){ @@ -856,5 +856,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::CreatePVectorAdjointBalancethickness{{{1*/ +/*FUNCTION Numericalflux::CreatePVectorAdjointBalancethickness{{{*/ ElementVector* Numericalflux::CreatePVectorAdjointBalancethickness(void){ @@ -863,5 +863,5 @@ } /*}}}*/ -/*FUNCTION Numericalflux::GetNormal {{{1*/ +/*FUNCTION Numericalflux::GetNormal {{{*/ void Numericalflux:: GetNormal(double* normal,double xyz_list[4][3]){ Index: /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Numericalflux.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Load.h" class Hook; @@ -35,10 +35,10 @@ - /*Numericalflux constructors,destructors {{{1*/ + /*Numericalflux constructors,destructors {{{*/ Numericalflux(); Numericalflux(int numericalflux_id,int i, IoModel* iomodel,int analysis_type); ~Numericalflux(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -48,5 +48,5 @@ Object* copy(); /*}}}*/ - /*Update virtual functions resolution: {{{1*/ + /*Update virtual functions resolution: {{{*/ void InputUpdateFromVector(double* vector, int name, int type){/*Do nothing*/} void InputUpdateFromVector(int* vector, int name, int type){_error_("Not implemented yet!");} @@ -62,5 +62,5 @@ void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; /*}}}*/ - /*Load virtual functions definitions: {{{1*/ + /*Load virtual functions definitions: {{{*/ void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); @@ -73,5 +73,5 @@ bool InAnalysis(int analysis_type); /*}}}*/ - /*Numericalflux management:{{{1*/ + /*Numericalflux management:{{{*/ void GetNormal(double* normal,double xyz_list[4][3]); ElementMatrix* CreateKMatrixPrognostic(void); Index: /issm/trunk-jpl/src/c/objects/Loads/Pengrid.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Pengrid.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Pengrid.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -24,5 +24,5 @@ /*Pengrid constructors and destructor*/ -/*FUNCTION Pengrid::Pengrid(){{{1*/ +/*FUNCTION Pengrid::Pengrid(){{{*/ Pengrid::Pengrid(){ this->inputs=NULL; @@ -40,6 +40,6 @@ } -/*}}}1*/ -/*FUNCTION Pengrid::Pengrid(int index, int id, IoModel* iomodel,int analysis_type){{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::Pengrid(int index, int id, IoModel* iomodel,int analysis_type){{{*/ Pengrid::Pengrid(int id, int index, IoModel* iomodel, int in_analysis_type){ //i is the element index @@ -90,5 +90,5 @@ } /*}}}*/ -/*FUNCTION Pengrid::~Pengrid(){{{1*/ +/*FUNCTION Pengrid::~Pengrid(){{{*/ Pengrid::~Pengrid(){ delete inputs; @@ -98,13 +98,13 @@ return; } -/*}}}1*/ +/*}}}*/ /*Object virtual functions definitions:*/ -/*FUNCTION Pengrid::Echo {{{1*/ +/*FUNCTION Pengrid::Echo {{{*/ void Pengrid::Echo(void){ this->DeepEcho(); } -/*}}}1*/ -/*FUNCTION Pengrid::DeepEcho{{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::DeepEcho{{{*/ void Pengrid::DeepEcho(void){ @@ -123,20 +123,20 @@ } /*}}}*/ -/*FUNCTION Pengrid::Id {{{1*/ +/*FUNCTION Pengrid::Id {{{*/ int Pengrid::Id(void){ return id; } -/*}}}1*/ -/*FUNCTION Pengrid::MyRank {{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::MyRank {{{*/ int Pengrid::MyRank(void){ extern int my_rank; return my_rank; } -/*}}}1*/ -/*FUNCTION Pengrid::ObjectEnum{{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::ObjectEnum{{{*/ int Pengrid::ObjectEnum(void){ return PengridEnum; } -/*}}}1*/ -/*FUNCTION Icefront::copy {{{1*/ +/*}}}*/ +/*FUNCTION Icefront::copy {{{*/ Object* Pengrid::copy() { @@ -177,5 +177,5 @@ /*Load virtual functions definitions:*/ -/*FUNCTION Pengrid::Configure {{{1*/ +/*FUNCTION Pengrid::Configure {{{*/ void Pengrid::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ @@ -194,11 +194,11 @@ this->parameters=parametersin; } -/*}}}1*/ -/*FUNCTION Pengrid::SetCurrentConfiguration {{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::SetCurrentConfiguration {{{*/ void Pengrid::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ } -/*}}}1*/ -/*FUNCTION Pengrid::CreateKMatrix {{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::CreateKMatrix {{{*/ void Pengrid::CreateKMatrix(Matrix* Kff, Matrix* Kfs){ @@ -207,6 +207,6 @@ } -/*}}}1*/ -/*FUNCTION Pengrid::CreatePVector {{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::CreatePVector {{{*/ void Pengrid::CreatePVector(Vector* pf){ @@ -215,6 +215,6 @@ } -/*}}}1*/ -/*FUNCTION Pengrid::PenaltyCreateMatrix {{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::PenaltyCreateMatrix {{{*/ void Pengrid::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs,double kmax){ @@ -248,6 +248,6 @@ } } -/*}}}1*/ -/*FUNCTION Pengrid::PenaltyCreatePVector {{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::PenaltyCreatePVector {{{*/ void Pengrid::PenaltyCreatePVector(Vector* pf,double kmax){ @@ -280,6 +280,6 @@ } } -/*}}}1*/ -/*FUNCTION Pengrid::InAnalysis{{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::InAnalysis{{{*/ bool Pengrid::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type)return true; @@ -289,40 +289,40 @@ /*Update virtual functions definitions:*/ -/*FUNCTION Pengrid::InputUpdateFromVector(double* vector, int name, int type) {{{1*/ +/*FUNCTION Pengrid::InputUpdateFromVector(double* vector, int name, int type) {{{*/ void Pengrid::InputUpdateFromVector(double* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromVector(int* vector, int name, int type) {{{1*/ +/*FUNCTION Pengrid::InputUpdateFromVector(int* vector, int name, int type) {{{*/ void Pengrid::InputUpdateFromVector(int* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/ +/*FUNCTION Pengrid::InputUpdateFromVector(bool* vector, int name, int type) {{{*/ void Pengrid::InputUpdateFromVector(bool* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromMatrixDakota(double* vector, int nrows, int ncols, int name, int type) {{{1*/ +/*FUNCTION Pengrid::InputUpdateFromMatrixDakota(double* vector, int nrows, int ncols, int name, int type) {{{*/ void Pengrid::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/ +/*FUNCTION Pengrid::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{*/ void Pengrid::InputUpdateFromVectorDakota(double* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/ +/*FUNCTION Pengrid::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{*/ void Pengrid::InputUpdateFromVectorDakota(int* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/ +/*FUNCTION Pengrid::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{*/ void Pengrid::InputUpdateFromVectorDakota(bool* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromConstant(double constant, int name) {{{1*/ +/*FUNCTION Pengrid::InputUpdateFromConstant(double constant, int name) {{{*/ void Pengrid::InputUpdateFromConstant(double constant, int name){ switch(name){ @@ -335,10 +335,10 @@ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromConstant(int constant, int name) {{{1*/ +/*FUNCTION Pengrid::InputUpdateFromConstant(int constant, int name) {{{*/ void Pengrid::InputUpdateFromConstant(int constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromConstant(bool constant, int name) {{{1*/ +/*FUNCTION Pengrid::InputUpdateFromConstant(bool constant, int name) {{{*/ void Pengrid::InputUpdateFromConstant(bool constant, int name){ @@ -352,5 +352,5 @@ } /*}}}*/ -/*FUNCTION Pengrid::InputUpdateFromSolution{{{1*/ +/*FUNCTION Pengrid::InputUpdateFromSolution{{{*/ void Pengrid::InputUpdateFromSolution(double* solution){ /*Nothing updated yet*/ @@ -359,5 +359,5 @@ /*Pengrid management:*/ -/*FUNCTION Pengrid::ConstraintActivate {{{1*/ +/*FUNCTION Pengrid::ConstraintActivate {{{*/ void Pengrid::ConstraintActivate(int* punstable){ @@ -383,6 +383,6 @@ } -/*}}}1*/ -/*FUNCTION Pengrid::ConstraintActivateThermal {{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::ConstraintActivateThermal {{{*/ void Pengrid::ConstraintActivateThermal(int* punstable){ @@ -452,7 +452,7 @@ *punstable=unstable; } -/*}}}1*/ +/*}}}*/ #ifdef _HAVE_DIAGNOSTIC_ -/*FUNCTION Pengrid::PenaltyCreateKMatrixDiagnosticStokes {{{1*/ +/*FUNCTION Pengrid::PenaltyCreateKMatrixDiagnosticStokes {{{*/ ElementMatrix* Pengrid::PenaltyCreateKMatrixDiagnosticStokes(double kmax){ @@ -485,8 +485,8 @@ return Ke; } -/*}}}1*/ +/*}}}*/ #endif #ifdef _HAVE_THERMAL_ -/*FUNCTION Pengrid::PenaltyCreateKMatrixMelting {{{1*/ +/*FUNCTION Pengrid::PenaltyCreateKMatrixMelting {{{*/ ElementMatrix* Pengrid::PenaltyCreateKMatrixMelting(double kmax){ @@ -517,6 +517,6 @@ return Ke; } -/*}}}1*/ -/*FUNCTION Pengrid::PenaltyCreateKMatrixThermal {{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::PenaltyCreateKMatrixThermal {{{*/ ElementMatrix* Pengrid::PenaltyCreateKMatrixThermal(double kmax){ @@ -536,6 +536,6 @@ return Ke; } -/*}}}1*/ -/*FUNCTION Pengrid::PenaltyCreatePVectorMelting {{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::PenaltyCreatePVectorMelting {{{*/ ElementVector* Pengrid::PenaltyCreatePVectorMelting(double kmax){ @@ -579,6 +579,6 @@ return pe; } -/*}}}1*/ -/*FUNCTION Pengrid::PenaltyCreatePVectorThermal {{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::PenaltyCreatePVectorThermal {{{*/ ElementVector* Pengrid::PenaltyCreatePVectorThermal(double kmax){ @@ -606,15 +606,15 @@ return pe; } -/*}}}1*/ +/*}}}*/ #endif -/*FUNCTION Pengrid::ResetConstraint {{{1*/ +/*FUNCTION Pengrid::ResetConstraint {{{*/ void Pengrid::ResetConstraint(void){ active=0; zigzag_counter=0; } -/*}}}1*/ -/*FUNCTION Pengrid::UpdateInputs {{{1*/ +/*}}}*/ +/*FUNCTION Pengrid::UpdateInputs {{{*/ void Pengrid::UpdateInputs(double* solution){ _error_("not supported yet!"); } -/*}}}1*/ +/*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Loads/Pengrid.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Pengrid.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Pengrid.h (revision 12365) @@ -6,5 +6,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Load.h" class Hook; @@ -40,10 +40,10 @@ public: - /*Pengrid constructors, destructors {{{1*/ + /*Pengrid constructors, destructors {{{*/ Pengrid(); Pengrid(int index, int id, IoModel* iomodel,int analysis_type); ~Pengrid(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -53,5 +53,5 @@ Object* copy(); /*}}}*/ - /*Update virtual functions resolution: {{{1*/ + /*Update virtual functions resolution: {{{*/ void InputUpdateFromVector(double* vector, int name, int type); void InputUpdateFromVector(int* vector, int name, int type); @@ -67,5 +67,5 @@ void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; /*}}}*/ - /*Load virtual functions definitions: {{{1*/ + /*Load virtual functions definitions: {{{*/ void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); @@ -78,5 +78,5 @@ bool InAnalysis(int analysis_type); /*}}}*/ - /*Pengrid management {{{1*/ + /*Pengrid management {{{*/ #ifdef _HAVE_DIAGNOSTIC_ ElementMatrix* PenaltyCreateKMatrixDiagnosticStokes(double kmax); Index: /issm/trunk-jpl/src/c/objects/Loads/Penpair.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Penpair.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -23,5 +23,5 @@ /*Penpair constructors and destructor*/ -/*FUNCTION Penpair::constructor {{{1*/ +/*FUNCTION Penpair::constructor {{{*/ Penpair::Penpair(){ @@ -31,6 +31,6 @@ return; } -/*}}}1*/ -/*FUNCTION Penpair::creation {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::creation {{{*/ Penpair::Penpair(int penpair_id, int* penpair_node_ids,int in_analysis_type){ @@ -43,14 +43,14 @@ return; } -/*}}}1*/ -/*FUNCTION Penpair::destructor {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::destructor {{{*/ Penpair::~Penpair(){ delete hnodes; return; } -/*}}}1*/ +/*}}}*/ /*Object virtual functions definitions:*/ -/*FUNCTION Penpair::Echo {{{1*/ +/*FUNCTION Penpair::Echo {{{*/ void Penpair::Echo(void){ @@ -64,6 +64,6 @@ return; } -/*}}}1*/ -/*FUNCTION Penpair::DeepEcho {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::DeepEcho {{{*/ void Penpair::DeepEcho(void){ @@ -75,21 +75,21 @@ return; } -/*}}}1*/ -/*FUNCTION Penpair::Id {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::Id {{{*/ int Penpair::Id(void){ return id; } -/*}}}1*/ -/*FUNCTION Penpair::MyRank {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::MyRank {{{*/ int Penpair::MyRank(void){ extern int my_rank; return my_rank; } -/*}}}1*/ -/*FUNCTION Penpair::ObjectEnum{{{1*/ +/*}}}*/ +/*FUNCTION Penpair::ObjectEnum{{{*/ int Penpair::ObjectEnum(void){ return PenpairEnum; } -/*}}}1*/ -/*FUNCTION Penpair::copy {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::copy {{{*/ Object* Penpair::copy() { @@ -115,5 +115,5 @@ /*Load virtual functions definitions:*/ -/*FUNCTION Penpair::Configure {{{1*/ +/*FUNCTION Penpair::Configure {{{*/ void Penpair::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ @@ -129,11 +129,11 @@ } -/*}}}1*/ -/*FUNCTION Penpair::SetCurrentConfiguration {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::SetCurrentConfiguration {{{*/ void Penpair::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ } -/*}}}1*/ -/*FUNCTION Penpair::CreateKMatrix {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::CreateKMatrix {{{*/ void Penpair::CreateKMatrix(Matrix* Kff, Matrix* Kfs){ /*If you code this piece, don't forget that a penalty will be inactive if it is dealing with clone nodes*/ @@ -142,6 +142,6 @@ } -/*}}}1*/ -/*FUNCTION Penpair::CreatePVector {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::CreatePVector {{{*/ void Penpair::CreatePVector(Vector* pf){ @@ -150,11 +150,11 @@ } -/*}}}1*/ -/*FUNCTION Penpair::CreateJacobianMatrix{{{1*/ +/*}}}*/ +/*FUNCTION Penpair::CreateJacobianMatrix{{{*/ void Penpair::CreateJacobianMatrix(Matrix* Jff){ this->CreateKMatrix(Jff,NULL); } -/*}}}1*/ -/*FUNCTION Penpair::PenaltyCreateKMatrix {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::PenaltyCreateKMatrix {{{*/ void Penpair::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs,double kmax){ @@ -181,17 +181,17 @@ } } -/*}}}1*/ -/*FUNCTION Penpair::PenaltyCreatePVector {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::PenaltyCreatePVector {{{*/ void Penpair::PenaltyCreatePVector(Vector* pf,double kmax){ /*No loads applied, do nothing: */ return; } -/*}}}1*/ -/*FUNCTION Penpair::PenaltyCreateJacobianMatrix{{{1*/ +/*}}}*/ +/*FUNCTION Penpair::PenaltyCreateJacobianMatrix{{{*/ void Penpair::PenaltyCreateJacobianMatrix(Matrix* Jff,double kmax){ this->PenaltyCreateKMatrix(Jff,NULL,kmax); } -/*}}}1*/ -/*FUNCTION Penpair::InAnalysis{{{1*/ +/*}}}*/ +/*FUNCTION Penpair::InAnalysis{{{*/ bool Penpair::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type)return true; @@ -201,30 +201,30 @@ /*Update virtual functions definitions:*/ -/*FUNCTION Penpair::InputUpdateFromConstant(double constant, int name) {{{1*/ +/*FUNCTION Penpair::InputUpdateFromConstant(double constant, int name) {{{*/ void Penpair::InputUpdateFromConstant(double constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Penpair::InputUpdateFromConstant(int constant, int name) {{{1*/ +/*FUNCTION Penpair::InputUpdateFromConstant(int constant, int name) {{{*/ void Penpair::InputUpdateFromConstant(int constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Penpair::InputUpdateFromConstant(bool constant, int name) {{{1*/ +/*FUNCTION Penpair::InputUpdateFromConstant(bool constant, int name) {{{*/ void Penpair::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Penpair::InputUpdateFromVector(double* vector, int name, int type) {{{1*/ +/*FUNCTION Penpair::InputUpdateFromVector(double* vector, int name, int type) {{{*/ void Penpair::InputUpdateFromVector(double* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Penpair::InputUpdateFromVector(int* vector, int name, int type) {{{1*/ +/*FUNCTION Penpair::InputUpdateFromVector(int* vector, int name, int type) {{{*/ void Penpair::InputUpdateFromVector(int* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Penpair::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/ +/*FUNCTION Penpair::InputUpdateFromVector(bool* vector, int name, int type) {{{*/ void Penpair::InputUpdateFromVector(bool* vector, int name, int type){ /*Nothing updated yet*/ @@ -233,5 +233,5 @@ /*Penpair management:*/ -/*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticHoriz{{{1*/ +/*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticHoriz{{{*/ ElementMatrix* Penpair::PenaltyCreateKMatrixDiagnosticHoriz(double kmax){ @@ -267,6 +267,6 @@ } } -/*}}}1*/ -/*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticMacAyealPattyn {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticMacAyealPattyn {{{*/ ElementMatrix* Penpair::PenaltyCreateKMatrixDiagnosticMacAyealPattyn(double kmax){ @@ -294,6 +294,6 @@ return Ke; } -/*}}}1*/ -/*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticStokes {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticStokes {{{*/ ElementMatrix* Penpair::PenaltyCreateKMatrixDiagnosticStokes(double kmax){ @@ -331,6 +331,6 @@ return Ke; } -/*}}}1*/ -/*FUNCTION Penpair::PenaltyCreateKMatrixPrognostic {{{1*/ +/*}}}*/ +/*FUNCTION Penpair::PenaltyCreateKMatrixPrognostic {{{*/ ElementMatrix* Penpair::PenaltyCreateKMatrixPrognostic(double kmax){ @@ -353,3 +353,3 @@ return Ke; } -/*}}}1*/ +/*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Loads/Penpair.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Penpair.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Penpair.h (revision 12365) @@ -6,5 +6,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Load.h" #include "../Node.h" @@ -27,10 +27,10 @@ public: - /*Penpair constructors, destructors: {{{1*/ + /*Penpair constructors, destructors: {{{*/ Penpair(); Penpair(int penpair_id,int* penpair_node_ids,int analysis_type); ~Penpair(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -40,5 +40,5 @@ Object* copy(); /*}}}*/ - /*Update virtual functions resolution: {{{1*/ + /*Update virtual functions resolution: {{{*/ void InputUpdateFromVector(double* vector, int name, int type); void InputUpdateFromVector(int* vector, int name, int type); @@ -54,5 +54,5 @@ void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; /*}}}*/ - /*Load virtual functions definitions: {{{1*/ + /*Load virtual functions definitions: {{{*/ void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); @@ -65,5 +65,5 @@ bool InAnalysis(int analysis_type); /*}}}*/ - /*Penpair management: {{{1*/ + /*Penpair management: {{{*/ ElementMatrix* PenaltyCreateKMatrixDiagnosticHoriz(double kmax); ElementMatrix* PenaltyCreateKMatrixDiagnosticMacAyealPattyn(double kmax); Index: /issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Riftfront.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -24,5 +24,5 @@ /*Riftfront constructors and destructor*/ -/*FUNCTION Riftfront::Riftfront(){{{1*/ +/*FUNCTION Riftfront::Riftfront(){{{*/ Riftfront::Riftfront(){ this->inputs=NULL; @@ -36,5 +36,5 @@ } /*}}}*/ -/*FUNCTION Riftfront::Riftfront(int id, int i, IoModel* iomodel,int analysis_type){{{1*/ +/*FUNCTION Riftfront::Riftfront(int id, int i, IoModel* iomodel,int analysis_type){{{*/ Riftfront::Riftfront(int riftfront_id,int i, IoModel* iomodel,int riftfront_analysis_type){ @@ -117,6 +117,6 @@ } -/*}}}1*/ -/*FUNCTION Riftfront::~Riftfront(){{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::~Riftfront(){{{*/ Riftfront::~Riftfront(){ delete inputs; @@ -130,5 +130,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION Riftfront::Echo {{{1*/ +/*FUNCTION Riftfront::Echo {{{*/ void Riftfront::Echo(void){ @@ -167,6 +167,6 @@ } -/*}}}1*/ -/*FUNCTION Riftfront::DeepEcho{{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::DeepEcho{{{*/ void Riftfront::DeepEcho(void){ @@ -183,14 +183,14 @@ } /*}}}*/ -/*FUNCTION Riftfront::Id {{{1*/ +/*FUNCTION Riftfront::Id {{{*/ int Riftfront::Id(void){ return id; } -/*}}}1*/ -/*FUNCTION Riftfront::MyRank {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::MyRank {{{*/ int Riftfront::MyRank(void){ extern int my_rank; return my_rank; } -/*}}}1*/ -/*FUNCTION Riftfront::ObjectEnum{{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::ObjectEnum{{{*/ int Riftfront::ObjectEnum(void){ @@ -198,6 +198,6 @@ } -/*}}}1*/ -/*FUNCTION Riftfront::copy {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::copy {{{*/ Object* Riftfront::copy() { @@ -247,5 +247,5 @@ /*Update virtual functions definitions:*/ -/*FUNCTION Riftfront::InputUpdateFromConstant(bool constant,int name) {{{1*/ +/*FUNCTION Riftfront::InputUpdateFromConstant(bool constant,int name) {{{*/ void Riftfront::InputUpdateFromConstant(bool constant,int name){ @@ -258,5 +258,5 @@ } /*}}}*/ -/*FUNCTION Riftfront::InputUpdateFromConstant(double constant,int name) {{{1*/ +/*FUNCTION Riftfront::InputUpdateFromConstant(double constant,int name) {{{*/ void Riftfront::InputUpdateFromConstant(double constant,int name){ @@ -269,5 +269,5 @@ } /*}}}*/ -/*FUNCTION Riftfront::InputUpdateFromConstant(double* constant,int name) {{{1*/ +/*FUNCTION Riftfront::InputUpdateFromConstant(double* constant,int name) {{{*/ void Riftfront::InputUpdateFromVector(double* vector, int name, int type){ @@ -284,5 +284,5 @@ /*Load virtual functions definitions:*/ -/*FUNCTION Riftfront::Configure {{{1*/ +/*FUNCTION Riftfront::Configure {{{*/ void Riftfront::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ @@ -303,10 +303,10 @@ } /*}}}*/ -/*FUNCTION Riftfront::SetCurrentConfiguration {{{1*/ +/*FUNCTION Riftfront::SetCurrentConfiguration {{{*/ void Riftfront::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ } /*}}}*/ -/*FUNCTION Riftfront::PenaltyCreateKMatrix {{{1*/ +/*FUNCTION Riftfront::PenaltyCreateKMatrix {{{*/ void Riftfront::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs,double kmax){ @@ -333,6 +333,6 @@ } } -/*}}}1*/ -/*FUNCTION Riftfront::PenaltyCreatePVector {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::PenaltyCreatePVector {{{*/ void Riftfront::PenaltyCreatePVector(Vector* pf,double kmax){ @@ -359,18 +359,18 @@ } } -/*}}}1*/ -/*FUNCTION Riftfront::CreateKMatrix {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::CreateKMatrix {{{*/ void Riftfront::CreateKMatrix(Matrix* Kff, Matrix* Kfs){ /*do nothing: */ return; } -/*}}}1*/ -/*FUNCTION Riftfront::CreatePVector {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::CreatePVector {{{*/ void Riftfront::CreatePVector(Vector* pf){ /*do nothing: */ return; } -/*}}}1*/ -/*FUNCTION Riftfront::InAnalysis{{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::InAnalysis{{{*/ bool Riftfront::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type) return true; @@ -380,5 +380,5 @@ /*Riftfront numerics*/ -/*FUNCTION Riftfront::PenaltyCreateKMatrixDiagnosticHoriz {{{1*/ +/*FUNCTION Riftfront::PenaltyCreateKMatrixDiagnosticHoriz {{{*/ ElementMatrix* Riftfront::PenaltyCreateKMatrixDiagnosticHoriz(double kmax){ @@ -462,6 +462,6 @@ return Ke; } -/*}}}1*/ -/*FUNCTION Riftfront::PenaltyCreatePVectorDiagnosticHoriz {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::PenaltyCreatePVectorDiagnosticHoriz {{{*/ ElementVector* Riftfront::PenaltyCreatePVectorDiagnosticHoriz(double kmax){ @@ -562,6 +562,6 @@ return pe; } -/*}}}1*/ -/*FUNCTION Riftfront::Constrain {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::Constrain {{{*/ #define _ZIGZAGCOUNTER_ @@ -654,6 +654,6 @@ return 1; } -/*}}}1*/ -/*FUNCTION Riftfront::FreezeConstraints{{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::FreezeConstraints{{{*/ void Riftfront::FreezeConstraints(void){ @@ -662,6 +662,6 @@ } -/*}}}1*/ -/*FUNCTION Riftfront::IsFrozen{{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::IsFrozen{{{*/ bool Riftfront::IsFrozen(void){ @@ -670,6 +670,6 @@ else return 0; } -/*}}}1*/ -/*FUNCTION Riftfront::IsMaterialStable {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::IsMaterialStable {{{*/ int Riftfront::IsMaterialStable(void){ @@ -688,6 +688,6 @@ return this->material_converged; } -/*}}}1*/ -/*FUNCTION Riftfront::MaxPenetration {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::MaxPenetration {{{*/ int Riftfront::MaxPenetration(double* ppenetration){ @@ -734,6 +734,6 @@ return 1; } -/*}}}1*/ -/*FUNCTION Riftfront::Penetration {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::Penetration {{{*/ int Riftfront::Penetration(double* ppenetration){ @@ -773,6 +773,6 @@ return 1; } -/*}}}1*/ -/*FUNCTION Riftfront::PotentialUnstableConstraint {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::PotentialUnstableConstraint {{{*/ int Riftfront::PotentialUnstableConstraint(int* punstable){ @@ -826,6 +826,6 @@ return 1; } -/*}}}1*/ -/*FUNCTION Riftfront::PreConstrain {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::PreConstrain {{{*/ int Riftfront::PreConstrain(int* punstable){ @@ -891,16 +891,16 @@ return 1; } -/*}}}1*/ -/*FUNCTION Riftfront::PreStable {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::PreStable {{{*/ bool Riftfront::PreStable(){ return prestable; } -/*}}}1*/ -/*FUNCTION Riftfront::SetPreStable {{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::SetPreStable {{{*/ void Riftfront::SetPreStable(){ prestable=1; } -/*}}}1*/ -/*FUNCTION Riftfront::IsInput{{{1*/ +/*}}}*/ +/*FUNCTION Riftfront::IsInput{{{*/ bool Riftfront::IsInput(int name){ if ( Index: /issm/trunk-jpl/src/c/objects/Loads/Riftfront.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Loads/Riftfront.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Loads/Riftfront.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Load.h" class Hook; @@ -47,10 +47,10 @@ - /*Riftfrontconstructors,destructors: {{{1*/ + /*Riftfrontconstructors,destructors: {{{*/ Riftfront(); Riftfront(int riftfront_id,int i, IoModel* iomodel,int analysis_type); ~Riftfront(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -60,5 +60,5 @@ Object* copy(); /*}}}*/ - /*Update virtual functions resolution: {{{1*/ + /*Update virtual functions resolution: {{{*/ void InputUpdateFromVector(double* vector, int name, int type); void InputUpdateFromVector(int* vector, int name, int type){_error_("Not implemented yet!");} @@ -74,5 +74,5 @@ void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("not implemented yet");}; /*}}}*/ - /*Load virtual functions definitions: {{{1*/ + /*Load virtual functions definitions: {{{*/ void Configure(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Vertices* vertices,Materials* materials,Parameters* parameters); @@ -85,5 +85,5 @@ bool InAnalysis(int analysis_type); /*}}}*/ - /*Riftfront specific routines: {{{1*/ + /*Riftfront specific routines: {{{*/ bool PreStable(); ElementMatrix* PenaltyCreateKMatrixDiagnosticHoriz(double kmax); Index: /issm/trunk-jpl/src/c/objects/Materials/Material.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Materials/Material.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Materials/Material.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ class Object; #include "../Object.h" Index: /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 12365) @@ -17,5 +17,5 @@ /*Matice constructors and destructor*/ -/*FUNCTION Matice::Matice(){{{1*/ +/*FUNCTION Matice::Matice(){{{*/ Matice::Matice(){ this->inputs=NULL; @@ -24,5 +24,5 @@ } /*}}}*/ -/*FUNCTION Matice::Matice(int id, int index, IoModel* iomodel, int num_vertices){{{1*/ +/*FUNCTION Matice::Matice(int id, int index, IoModel* iomodel, int num_vertices){{{*/ Matice::Matice(int matice_mid,int index, IoModel* iomodel){ @@ -48,5 +48,5 @@ } /*}}}*/ -/*FUNCTION Matice::~Matice(){{{1*/ +/*FUNCTION Matice::~Matice(){{{*/ Matice::~Matice(){ delete helement; @@ -57,5 +57,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION Matice::Echo {{{1*/ +/*FUNCTION Matice::Echo {{{*/ void Matice::Echo(void){ @@ -68,5 +68,5 @@ } /*}}}*/ -/*FUNCTION Matice::DeepEcho {{{1*/ +/*FUNCTION Matice::DeepEcho {{{*/ void Matice::DeepEcho(void){ @@ -79,8 +79,8 @@ } /*}}}*/ -/*FUNCTION Matice::Id {{{1*/ +/*FUNCTION Matice::Id {{{*/ int Matice::Id(void){ return mid; } /*}}}*/ -/*FUNCTION Matice::MyRank {{{1*/ +/*FUNCTION Matice::MyRank {{{*/ int Matice::MyRank(void){ extern int my_rank; @@ -88,5 +88,5 @@ } /*}}}*/ -/*FUNCTION Matice::ObjectEnum{{{1*/ +/*FUNCTION Matice::ObjectEnum{{{*/ int Matice::ObjectEnum(void){ @@ -95,5 +95,5 @@ } /*}}}*/ -/*FUNCTION Matice::copy {{{1*/ +/*FUNCTION Matice::copy {{{*/ Object* Matice::copy() { @@ -115,5 +115,5 @@ /*Matice management*/ -/*FUNCTION Matice::Configure {{{1*/ +/*FUNCTION Matice::Configure {{{*/ void Matice::Configure(Elements* elementsin){ @@ -123,10 +123,10 @@ } /*}}}*/ -/*FUNCTION Matice::SetCurrentConfiguration {{{1*/ +/*FUNCTION Matice::SetCurrentConfiguration {{{*/ void Matice::SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){ } /*}}}*/ -/*FUNCTION Matice::GetB {{{1*/ +/*FUNCTION Matice::GetB {{{*/ double Matice::GetB(){ @@ -138,5 +138,5 @@ } /*}}}*/ -/*FUNCTION Matice::GetBbar {{{1*/ +/*FUNCTION Matice::GetBbar {{{*/ double Matice::GetBbar(){ @@ -148,5 +148,5 @@ } /*}}}*/ -/*FUNCTION Matice::GetN {{{1*/ +/*FUNCTION Matice::GetN {{{*/ double Matice::GetN(){ @@ -158,5 +158,5 @@ } /*}}}*/ -/*FUNCTION Matice::GetVectorFromInputs{{{1*/ +/*FUNCTION Matice::GetVectorFromInputs{{{*/ void Matice::GetVectorFromInputs(Vector* vector,int input_enum){ @@ -190,5 +190,5 @@ } /*}}}*/ -/*FUNCTION Matice::GetViscosity2d {{{1*/ +/*FUNCTION Matice::GetViscosity2d {{{*/ void Matice::GetViscosity2d(double* pviscosity, double* epsilon){ /*From a string tensor and a material object, return viscosity, using Glen's flow law. @@ -254,5 +254,5 @@ } /*}}}*/ -/*FUNCTION Matice::GetViscosity3d {{{1*/ +/*FUNCTION Matice::GetViscosity3d {{{*/ void Matice::GetViscosity3d(double* pviscosity3d, double* epsilon){ @@ -325,5 +325,5 @@ } /*}}}*/ -/*FUNCTION Matice::GetViscosity3dStokes {{{1*/ +/*FUNCTION Matice::GetViscosity3dStokes {{{*/ void Matice::GetViscosity3dStokes(double* pviscosity3d, double* epsilon){ /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: @@ -397,5 +397,5 @@ } /*}}}*/ -/*FUNCTION Matice::GetViscosityComplement {{{1*/ +/*FUNCTION Matice::GetViscosityComplement {{{*/ void Matice::GetViscosityComplement(double* pviscosity_complement, double* epsilon){ /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: @@ -453,5 +453,5 @@ } /*}}}*/ -/*FUNCTION Matice::GetViscosityDerivativeEpsSquare{{{1*/ +/*FUNCTION Matice::GetViscosityDerivativeEpsSquare{{{*/ void Matice::GetViscosityDerivativeEpsSquare(double* pmu_prime, double* epsilon){ @@ -487,5 +487,5 @@ } /*}}}*/ -/*FUNCTION Matice::GetViscosity2dDerivativeEpsSquare{{{1*/ +/*FUNCTION Matice::GetViscosity2dDerivativeEpsSquare{{{*/ void Matice::GetViscosity2dDerivativeEpsSquare(double* pmu_prime, double* epsilon){ @@ -518,5 +518,5 @@ } /*}}}*/ -/*FUNCTION Matice::InputDuplicate{{{1*/ +/*FUNCTION Matice::InputDuplicate{{{*/ void Matice::InputDuplicate(int original_enum,int new_enum){ @@ -526,5 +526,5 @@ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromVector(double* vector, int name, int type) {{{1*/ +/*FUNCTION Matice::InputUpdateFromVector(double* vector, int name, int type) {{{*/ void Matice::InputUpdateFromVector(double* vector, int name, int type){ @@ -556,15 +556,15 @@ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromVector(int* vector, int name, int type) {{{1*/ +/*FUNCTION Matice::InputUpdateFromVector(int* vector, int name, int type) {{{*/ void Matice::InputUpdateFromVector(int* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/ +/*FUNCTION Matice::InputUpdateFromVector(bool* vector, int name, int type) {{{*/ void Matice::InputUpdateFromVector(bool* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/ +/*FUNCTION Matice::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{*/ void Matice::InputUpdateFromVectorDakota(double* vector, int name, int type){ @@ -590,5 +590,5 @@ for (int i=0;i<3;i++) values[i]=vector[((Tria*)element)->nodes[i]->GetSidList()]; //use sid list, to index into serial oriented vector this->inputs->AddInput(new TriaP1Input(name,values)); - /*Special case for rheology B in 2D: Pourave land for this solution{{{2*/ + /*Special case for rheology B in 2D: Pourave land for this solution{{{*/ if(name==MaterialsRheologyBEnum){ /*Are we in 2D?:*/ @@ -617,40 +617,40 @@ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{1*/ +/*FUNCTION Matice::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{*/ void Matice::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols,int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/ +/*FUNCTION Matice::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{*/ void Matice::InputUpdateFromVectorDakota(int* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/ +/*FUNCTION Matice::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{*/ void Matice::InputUpdateFromVectorDakota(bool* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromConstant(double constant, int name) {{{1*/ +/*FUNCTION Matice::InputUpdateFromConstant(double constant, int name) {{{*/ void Matice::InputUpdateFromConstant(double constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromConstant(int constant, int name) {{{1*/ +/*FUNCTION Matice::InputUpdateFromConstant(int constant, int name) {{{*/ void Matice::InputUpdateFromConstant(int constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromConstant(bool constant, int name) {{{1*/ +/*FUNCTION Matice::InputUpdateFromConstant(bool constant, int name) {{{*/ void Matice::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromSolution{{{1*/ +/*FUNCTION Matice::InputUpdateFromSolution{{{*/ void Matice::InputUpdateFromSolution(double* solution){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matice::InputUpdateFromIoModel{{{1*/ +/*FUNCTION Matice::InputUpdateFromIoModel{{{*/ void Matice::InputUpdateFromIoModel(int index, IoModel* iomodel){ @@ -756,5 +756,5 @@ } /*}}}*/ -/*FUNCTION Matice::IsInput{{{1*/ +/*FUNCTION Matice::IsInput{{{*/ bool Matice::IsInput(int name){ if ( Index: /issm/trunk-jpl/src/c/objects/Materials/Matice.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Materials/Matice.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Materials/Matice.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Material.h" class IoModel; @@ -25,10 +25,10 @@ Inputs* inputs; - /*Matice constructors, destructors: {{{1*/ + /*Matice constructors, destructors: {{{*/ Matice(); Matice(int mid,int i, IoModel* iomodel); ~Matice(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -38,5 +38,5 @@ Object* copy(); /*}}}*/ - /*Update virtual functions definitions: {{{1*/ + /*Update virtual functions definitions: {{{*/ void InputUpdateFromVector(double* vector, int name, int type); void InputUpdateFromVector(int* vector, int name, int type); @@ -52,10 +52,10 @@ void InputUpdateFromIoModel(int index, IoModel* iomodel); /*}}}*/ - /*Material virtual functions resolution: {{{1*/ + /*Material virtual functions resolution: {{{*/ void InputDuplicate(int original_enum,int new_enum); void Configure(Elements* elements); void GetVectorFromInputs(Vector* vector,int input_enum); /*}}}*/ - /*Matice Numerics: {{{1*/ + /*Matice Numerics: {{{*/ void SetCurrentConfiguration(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin); void GetViscosity2d(double* pviscosity, double* pepsilon); Index: /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Materials/Matpar.cpp (revision 12365) @@ -17,10 +17,10 @@ /*Matpar constructors and destructor*/ -/*FUNCTION Matpar::Matpar() {{{1*/ +/*FUNCTION Matpar::Matpar() {{{*/ Matpar::Matpar(){ return; } -/*}}}1*/ -/*FUNCTION Matpar::Matpar(int matpar_mid,IoModel* iomodel){{{1*/ +/*}}}*/ +/*FUNCTION Matpar::Matpar(int matpar_mid,IoModel* iomodel){{{*/ Matpar::Matpar(int matpar_mid, IoModel* iomodel){ @@ -46,13 +46,13 @@ iomodel->Constant(&this->hydro_q,HydrologyQEnum); } -/*}}}1*/ -/*FUNCTION Matpar::~Matpar() {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::~Matpar() {{{*/ Matpar::~Matpar(){ return; } -/*}}}1*/ +/*}}}*/ /*Object virtual functions definitions:*/ -/*FUNCTION Matpar::Echo {{{1*/ +/*FUNCTION Matpar::Echo {{{*/ void Matpar::Echo(void){ @@ -74,21 +74,21 @@ return; } -/*}}}1*/ -/*FUNCTION Matpar::DeepEcho {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::DeepEcho {{{*/ void Matpar::DeepEcho(void){ this->Echo(); } -/*}}}1*/ -/*FUNCTION Matpar::Id {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::Id {{{*/ int Matpar::Id(void){ return mid; } -/*}}}1*/ -/*FUNCTION Matpar::MyRank {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::MyRank {{{*/ int Matpar::MyRank(void){ extern int my_rank; return my_rank; } -/*}}}1*/ -/*FUNCTION Matpar::ObjectEnum{{{1*/ +/*}}}*/ +/*FUNCTION Matpar::ObjectEnum{{{*/ int Matpar::ObjectEnum(void){ @@ -96,48 +96,48 @@ } -/*}}}1*/ -/*FUNCTION Matpar::copy {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::copy {{{*/ Object* Matpar::copy() { return new Matpar(*this); } -/*}}}1*/ +/*}}}*/ /*Update virtual functions definitions:*/ -/*FUNCTION Matpar::InputUpdateFromVector(double* vector, int name, int type) {{{1*/ +/*FUNCTION Matpar::InputUpdateFromVector(double* vector, int name, int type) {{{*/ void Matpar::InputUpdateFromVector(double* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromVector(int* vector, int name, int type) {{{1*/ +/*FUNCTION Matpar::InputUpdateFromVector(int* vector, int name, int type) {{{*/ void Matpar::InputUpdateFromVector(int* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromVector(bool* vector, int name, int type) {{{1*/ +/*FUNCTION Matpar::InputUpdateFromVector(bool* vector, int name, int type) {{{*/ void Matpar::InputUpdateFromVector(bool* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{1*/ +/*FUNCTION Matpar::InputUpdateFromVectorDakota(double* vector, int name, int type) {{{*/ void Matpar::InputUpdateFromVectorDakota(double* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{1*/ +/*FUNCTION Matpar::InputUpdateFromVectorDakota(int* vector, int name, int type) {{{*/ void Matpar::InputUpdateFromVectorDakota(int* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{1*/ +/*FUNCTION Matpar::InputUpdateFromVectorDakota(bool* vector, int name, int type) {{{*/ void Matpar::InputUpdateFromVectorDakota(bool* vector, int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{1*/ +/*FUNCTION Matpar::InputUpdateFromMatrixDakota(int* vector, int name, int type) {{{*/ void Matpar::InputUpdateFromMatrixDakota(double* matrix, int nrows, int ncols,int name, int type){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromConstant(double constant, int name) {{{1*/ +/*FUNCTION Matpar::InputUpdateFromConstant(double constant, int name) {{{*/ void Matpar::InputUpdateFromConstant(double constant, int name){ @@ -188,15 +188,15 @@ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromConstant(int constant, int name) {{{1*/ +/*FUNCTION Matpar::InputUpdateFromConstant(int constant, int name) {{{*/ void Matpar::InputUpdateFromConstant(int constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromConstant(bool constant, int name) {{{1*/ +/*FUNCTION Matpar::InputUpdateFromConstant(bool constant, int name) {{{*/ void Matpar::InputUpdateFromConstant(bool constant, int name){ /*Nothing updated yet*/ } /*}}}*/ -/*FUNCTION Matpar::InputUpdateFromSolution{{{1*/ +/*FUNCTION Matpar::InputUpdateFromSolution{{{*/ void Matpar::InputUpdateFromSolution(double* solution){ /*Nothing updated yet*/ @@ -205,5 +205,5 @@ /*Matpar management: */ -/*FUNCTION Matpar::Configure {{{1*/ +/*FUNCTION Matpar::Configure {{{*/ void Matpar::Configure(Elements* elementsin){ @@ -212,106 +212,106 @@ } /*}}}*/ -/*FUNCTION Matpar::GetBeta {{{1*/ +/*FUNCTION Matpar::GetBeta {{{*/ double Matpar::GetBeta(){ return beta; } -/*}}}1*/ -/*FUNCTION Matpar::GetG {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetG {{{*/ double Matpar::GetG(){ return g; } -/*}}}1*/ -/*FUNCTION Matpar::GetHeatCapacity {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetHeatCapacity {{{*/ double Matpar::GetHeatCapacity(){ return heatcapacity; } -/*}}}1*/ -/*FUNCTION Matpar::GetLatentHeat {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetLatentHeat {{{*/ double Matpar::GetLatentHeat(){ return latentheat; } -/*}}}1*/ -/*FUNCTION Matpar::GetMeltingPoint {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetMeltingPoint {{{*/ double Matpar::GetMeltingPoint(){ return meltingpoint; } -/*}}}1*/ -/*FUNCTION Matpar::GetReferenceTemperature {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetReferenceTemperature {{{*/ double Matpar::GetReferenceTemperature(){ return referencetemperature; } -/*}}}1*/ -/*FUNCTION Matpar::GetMixedLayerCapacity {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetMixedLayerCapacity {{{*/ double Matpar::GetMixedLayerCapacity(){ return mixed_layer_capacity; } -/*}}}1*/ -/*FUNCTION Matpar::GetRhoIce {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetRhoIce {{{*/ double Matpar::GetRhoIce(){ return rho_ice; } -/*}}}1*/ -/*FUNCTION Matpar::GetRhoWater {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetRhoWater {{{*/ double Matpar::GetRhoWater(){ return rho_water; } -/*}}}1*/ -/*FUNCTION Matpar::GetRhoFreshwater {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetRhoFreshwater {{{*/ double Matpar::GetRhoFreshwater(){ return rho_freshwater; } -/*}}}1*/ -/*FUNCTION Matpar::GetMuWater {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetMuWater {{{*/ double Matpar::GetMuWater(){ return mu_water; } -/*}}}1*/ -/*FUNCTION Matpar::GetThermalConductivity {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetThermalConductivity {{{*/ double Matpar::GetThermalConductivity(){ return thermalconductivity; } -/*}}}1*/ -/*FUNCTION Matpar::GetThermalExchangeVelocity {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetThermalExchangeVelocity {{{*/ double Matpar::GetThermalExchangeVelocity(){ return thermal_exchange_velocity; } -/*}}}1*/ -/*FUNCTION Matpar::GetKn {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetKn {{{*/ double Matpar::GetKn(){ return kn; } -/*}}}1*/ -/*FUNCTION Matpar::GetHydrologyP {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetHydrologyP {{{*/ double Matpar::GetHydrologyP(){ return hydro_p; } -/*}}}1*/ -/*FUNCTION Matqar::GetHydrologyQ {{{1*/ +/*}}}*/ +/*FUNCTION Matqar::GetHydrologyQ {{{*/ double Matpar::GetHydrologyQ(){ return hydro_q; } -/*}}}1*/ -/*FUNCTION Matpar::GetHydrologyCR {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetHydrologyCR {{{*/ double Matpar::GetHydrologyCR(){ return hydro_CR; } -/*}}}1*/ -/*FUNCTION Matpar::GetHydrologyN {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetHydrologyN {{{*/ double Matpar::GetHydrologyN(){ return hydro_n; } -/*}}}1*/ -/*FUNCTION Matpar::TMeltingPoint {{{1*/ +/*}}}*/ +/*FUNCTION Matpar::TMeltingPoint {{{*/ double Matpar::TMeltingPoint(double pressure){ return meltingpoint-beta*pressure; } -/*}}}1*/ -/*FUNCTION Matpar::PureIceEnthalpy{{{1*/ +/*}}}*/ +/*FUNCTION Matpar::PureIceEnthalpy{{{*/ double Matpar::PureIceEnthalpy(double pressure){ return heatcapacity*(TMeltingPoint(pressure)-referencetemperature); } -/*}}}1*/ -/*FUNCTION Matpar::GetEnthalpyDiffusionParameter{{{1*/ +/*}}}*/ +/*FUNCTION Matpar::GetEnthalpyDiffusionParameter{{{*/ double Matpar::GetEnthalpyDiffusionParameter(double enthalpy,double pressure){ if(enthalpy @@ -21,5 +21,5 @@ /*Node constructors and destructors:*/ -/*FUNCTION Node::Node() default constructor {{{1*/ +/*FUNCTION Node::Node() default constructor {{{*/ Node::Node(){ this->inputs=NULL; @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION Node::Node(int node_id,int node_sid,int vertex_id,int io_index, IoModel* iomodel,int analysis_type) {{{1*/ +/*FUNCTION Node::Node(int node_id,int node_sid,int vertex_id,int io_index, IoModel* iomodel,int analysis_type) {{{*/ Node::Node(int node_id,int node_sid,int vertex_id,int io_index, IoModel* iomodel,int analysis_type){ @@ -145,5 +145,5 @@ } /*}}}*/ -/*FUNCTION Node::~Node(){{{1*/ +/*FUNCTION Node::~Node(){{{*/ Node::~Node(){ delete inputs; @@ -154,5 +154,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION Node::Echo{{{1*/ +/*FUNCTION Node::Echo{{{*/ void Node::Echo(void){ @@ -168,5 +168,5 @@ } /*}}}*/ -/*FUNCTION Node::DeepEcho{{{1*/ +/*FUNCTION Node::DeepEcho{{{*/ void Node::DeepEcho(void){ @@ -183,8 +183,8 @@ } /*}}}*/ -/*FUNCTION Node::Id{{{1*/ +/*FUNCTION Node::Id{{{*/ int Node::Id(void){ return id; } /*}}}*/ -/*FUNCTION Node::MyRank{{{1*/ +/*FUNCTION Node::MyRank{{{*/ int Node::MyRank(void){ extern int my_rank; @@ -193,5 +193,5 @@ } /*}}}*/ -/*FUNCTION Node::ObjectEnum{{{1*/ +/*FUNCTION Node::ObjectEnum{{{*/ int Node::ObjectEnum(void){ @@ -202,5 +202,5 @@ /*Node management:*/ -/*FUNCTION Node::Configure {{{1*/ +/*FUNCTION Node::Configure {{{*/ void Node::Configure(DataSet* nodesin,Vertices* verticesin){ @@ -212,9 +212,9 @@ } -/*FUNCTION Node::SetCurrentConfiguration {{{1*/ +/*FUNCTION Node::SetCurrentConfiguration {{{*/ void Node::SetCurrentConfiguration(DataSet* nodesin,Vertices* verticesin){ } -/*FUNCTION Node::GetDof {{{1*/ +/*FUNCTION Node::GetDof {{{*/ int Node::GetDof(int dofindex,int setenum){ @@ -235,5 +235,5 @@ } /*}}}*/ -/*FUNCTION Node::GetDofList1{{{1*/ +/*FUNCTION Node::GetDofList1{{{*/ int Node::GetDofList1(void){ @@ -245,5 +245,5 @@ } /*}}}*/ -/*FUNCTION Node::GetDofList{{{1*/ +/*FUNCTION Node::GetDofList{{{*/ void Node::GetDofList(int* outdoflist,int approximation_enum,int setenum){ int i; @@ -307,5 +307,5 @@ } /*}}}*/ -/*FUNCTION Node::GetSidList{{{1*/ +/*FUNCTION Node::GetSidList{{{*/ int Node::GetSidList(void){ @@ -317,5 +317,5 @@ } /*}}}*/ -/*FUNCTION Node::GetLocalDofList{{{1*/ +/*FUNCTION Node::GetLocalDofList{{{*/ void Node::GetLocalDofList(int* outdoflist,int approximation_enum,int setenum){ int i; @@ -416,8 +416,8 @@ } /*}}}*/ -/*FUNCTION Node::Sid{{{1*/ +/*FUNCTION Node::Sid{{{*/ int Node::Sid(void){ return sid; } /*}}}*/ -/*FUNCTION Node::GetVertexId {{{1*/ +/*FUNCTION Node::GetVertexId {{{*/ int Node::GetVertexId(void){ @@ -428,5 +428,5 @@ } /*}}}*/ -/*FUNCTION Node::GetVertexDof {{{1*/ +/*FUNCTION Node::GetVertexDof {{{*/ int Node::GetVertexDof(void){ @@ -438,5 +438,5 @@ /*}}}*/ #ifdef _HAVE_DIAGNOSTIC_ -/*FUNCTION Node::GetCoordinateSystem{{{1*/ +/*FUNCTION Node::GetCoordinateSystem{{{*/ void Node::GetCoordinateSystem(IssmDouble* coord_system_out){ @@ -447,5 +447,5 @@ /*}}}*/ #endif -/*FUNCTION Node::SetVertexDof {{{1*/ +/*FUNCTION Node::SetVertexDof {{{*/ void Node::SetVertexDof(int in_dof){ @@ -457,5 +457,5 @@ } /*}}}*/ -/*FUNCTION Node::InAnalysis{{{1*/ +/*FUNCTION Node::InAnalysis{{{*/ bool Node::InAnalysis(int in_analysis_type){ if (in_analysis_type==this->analysis_type) return true; @@ -465,5 +465,5 @@ /*Node numerics:*/ -/*FUNCTION Node::ApplyConstraints{{{1*/ +/*FUNCTION Node::ApplyConstraints{{{*/ void Node::ApplyConstraint(int dof,IssmDouble value){ @@ -476,5 +476,5 @@ } /*}}}*/ -/*FUNCTION Node::RelaxConstraint{{{1*/ +/*FUNCTION Node::RelaxConstraint{{{*/ void Node::RelaxConstraint(int dof){ @@ -484,5 +484,5 @@ } /*}}}*/ -/*FUNCTION Node::CreateVecSets {{{1*/ +/*FUNCTION Node::CreateVecSets {{{*/ void Node::CreateVecSets(Vector* pv_g,Vector* pv_f,Vector* pv_s){ @@ -510,5 +510,5 @@ } /*}}}*/ -/*FUNCTION Node::CreateNodalConstraints{{{1*/ +/*FUNCTION Node::CreateNodalConstraints{{{*/ void Node::CreateNodalConstraints(Vector* ys){ @@ -539,5 +539,5 @@ } /*}}}*/ -/*FUNCTION Node::DofInSSet {{{1*/ +/*FUNCTION Node::DofInSSet {{{*/ void Node::DofInSSet(int dof){ @@ -549,5 +549,5 @@ } /*}}}*/ -/*FUNCTION Node::DofInFSet {{{1*/ +/*FUNCTION Node::DofInFSet {{{*/ void Node::DofInFSet(int dof){ @@ -559,5 +559,5 @@ } /*}}}*/ -/*FUNCTION Node::FreezeDof{{{1*/ +/*FUNCTION Node::FreezeDof{{{*/ void Node::FreezeDof(int dof){ @@ -566,5 +566,5 @@ } /*}}}*/ -/*FUNCTION Node::GetApproximation {{{1*/ +/*FUNCTION Node::GetApproximation {{{*/ int Node::GetApproximation(){ @@ -577,5 +577,5 @@ } /*}}}*/ -/*FUNCTION Node::GetConnectivity {{{1*/ +/*FUNCTION Node::GetConnectivity {{{*/ int Node::GetConnectivity(){ @@ -585,5 +585,5 @@ } /*}}}*/ -/*FUNCTION Node::GetNumberOfDofs{{{1*/ +/*FUNCTION Node::GetNumberOfDofs{{{*/ int Node::GetNumberOfDofs(int approximation_enum,int setenum){ @@ -633,5 +633,5 @@ } /*}}}*/ -/*FUNCTION Node::GetSigma {{{1*/ +/*FUNCTION Node::GetSigma {{{*/ IssmDouble Node::GetSigma(){ Vertex* vertex=NULL; @@ -641,5 +641,5 @@ } /*}}}*/ -/*FUNCTION Node::GetX {{{1*/ +/*FUNCTION Node::GetX {{{*/ IssmDouble Node::GetX(){ Vertex* vertex=NULL; @@ -649,5 +649,5 @@ } /*}}}*/ -/*FUNCTION Node::GetY {{{1*/ +/*FUNCTION Node::GetY {{{*/ IssmDouble Node::GetY(){ Vertex* vertex=NULL; @@ -657,5 +657,5 @@ } /*}}}*/ -/*FUNCTION Node::GetZ {{{1*/ +/*FUNCTION Node::GetZ {{{*/ IssmDouble Node::GetZ(){ Vertex* vertex=NULL; @@ -665,5 +665,5 @@ } /*}}}*/ -/*FUNCTION Node::IsClone {{{1*/ +/*FUNCTION Node::IsClone {{{*/ int Node::IsClone(){ @@ -672,5 +672,5 @@ } /*}}}*/ -/*FUNCTION Node::IsOnBed {{{1*/ +/*FUNCTION Node::IsOnBed {{{*/ int Node::IsOnBed(){ @@ -683,5 +683,5 @@ } /*}}}*/ -/*FUNCTION Node::IsGrounded {{{1*/ +/*FUNCTION Node::IsGrounded {{{*/ int Node::IsGrounded(){ @@ -694,5 +694,5 @@ } /*}}}*/ -/*FUNCTION Node::IsFloating {{{1*/ +/*FUNCTION Node::IsFloating {{{*/ int Node::IsFloating(){ @@ -705,5 +705,5 @@ } /*}}}*/ -/*FUNCTION Node::IsOnSurface {{{1*/ +/*FUNCTION Node::IsOnSurface {{{*/ int Node::IsOnSurface(){ @@ -716,5 +716,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromVector(IssmDouble* vector, int name, int type){{{1*/ +/*FUNCTION Node::InputUpdateFromVector(IssmDouble* vector, int name, int type){{{*/ void Node::InputUpdateFromVector(IssmDouble* vector, int name, int type){ @@ -722,5 +722,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromVector(int* vector, int name, int type){{{1*/ +/*FUNCTION Node::InputUpdateFromVector(int* vector, int name, int type){{{*/ void Node::InputUpdateFromVector(int* vector, int name, int type){ @@ -728,5 +728,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromVector(bool* vector, int name, int type){{{1*/ +/*FUNCTION Node::InputUpdateFromVector(bool* vector, int name, int type){{{*/ void Node::InputUpdateFromVector(bool* vector, int name, int type){ @@ -734,5 +734,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){{{1*/ +/*FUNCTION Node::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){{{*/ void Node::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){ @@ -740,5 +740,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){{{1*/ +/*FUNCTION Node::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){{{*/ void Node::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){ @@ -746,5 +746,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromVectorDakota(int* vector, int name, int type){{{1*/ +/*FUNCTION Node::InputUpdateFromVectorDakota(int* vector, int name, int type){{{*/ void Node::InputUpdateFromVectorDakota(int* vector, int name, int type){ @@ -752,5 +752,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromVectorDakota(bool* vector, int name, int type){{{1*/ +/*FUNCTION Node::InputUpdateFromVectorDakota(bool* vector, int name, int type){{{*/ void Node::InputUpdateFromVectorDakota(bool* vector, int name, int type){ @@ -758,5 +758,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromConstant(IssmDouble constant, int name){{{1*/ +/*FUNCTION Node::InputUpdateFromConstant(IssmDouble constant, int name){{{*/ void Node::InputUpdateFromConstant(IssmDouble constant, int name){ @@ -764,5 +764,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromConstant(int constant, int name){{{1*/ +/*FUNCTION Node::InputUpdateFromConstant(int constant, int name){{{*/ void Node::InputUpdateFromConstant(int constant, int name){ @@ -770,5 +770,5 @@ } /*}}}*/ -/*FUNCTION Node::InputUpdateFromConstant(bool constant, int name){{{1*/ +/*FUNCTION Node::InputUpdateFromConstant(bool constant, int name){{{*/ void Node::InputUpdateFromConstant(bool constant, int name){ @@ -776,5 +776,5 @@ } /*}}}*/ -/*FUNCTION Node::UpdateSpcs {{{1*/ +/*FUNCTION Node::UpdateSpcs {{{*/ void Node::UpdateSpcs(IssmDouble* ys){ @@ -791,5 +791,5 @@ } /*}}}*/ -/*FUNCTION Node::VecMerge {{{1*/ +/*FUNCTION Node::VecMerge {{{*/ void Node::VecMerge(Vector* ug, IssmDouble* vector_serial,int setenum){ @@ -842,5 +842,5 @@ } /*}}}*/ -/*FUNCTION Node::VecReduce {{{1*/ +/*FUNCTION Node::VecReduce {{{*/ void Node::VecReduce(Vector* vector, IssmDouble* ug_serial,int setenum){ @@ -889,5 +889,5 @@ /* DofObject routines:*/ -/*FUNCTION Node::DistributeDofs{{{1*/ +/*FUNCTION Node::DistributeDofs{{{*/ void Node::DistributeDofs(int* pdofcount,int setenum){ @@ -936,5 +936,5 @@ } /*}}}*/ -/*FUNCTION Node::Off_setDofs{{{1*/ +/*FUNCTION Node::Off_setDofs{{{*/ void Node::OffsetDofs(int dofcount,int setenum){ @@ -960,5 +960,5 @@ } /*}}}*/ -/*FUNCTION Node::ShowTrueDofs{{{1*/ +/*FUNCTION Node::ShowTrueDofs{{{*/ void Node::ShowTrueDofs(int* truedofs, int ncols,int setenum){ @@ -977,5 +977,5 @@ } /*}}}*/ -/*FUNCTION Node::UpdateCloneDofs{{{1*/ +/*FUNCTION Node::UpdateCloneDofs{{{*/ void Node::UpdateCloneDofs(int* alltruedofs,int ncols,int setenum){ @@ -996,5 +996,5 @@ } /*}}}*/ -/*FUNCTION Node::SetClone {{{1*/ +/*FUNCTION Node::SetClone {{{*/ void Node::SetClone(int* minranks){ Index: /issm/trunk-jpl/src/c/objects/Node.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Node.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Node.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Object.h" #include "../shared/shared.h" @@ -34,10 +34,10 @@ IssmDouble coord_system[3][3]; - /*Node constructors, destructors {{{1*/ + /*Node constructors, destructors {{{*/ Node(); Node(int node_id,int node_sid, int vertex_id,int io_index, IoModel* iomodel,int analysis_type); ~Node(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -47,5 +47,5 @@ Object* copy(){_error_("Not implemented yet (similar to Elements)");}; /*}}}*/ - /*Update virtual functions definitions: {{{1*/ + /*Update virtual functions definitions: {{{*/ void InputUpdateFromVector(IssmDouble* vector, int name, int type); @@ -62,5 +62,5 @@ void InputUpdateFromIoModel(int index, IoModel* iomodel){_error_("Not implemented yet!");} /*}}}*/ - /*Node numerical routines {{{1*/ + /*Node numerical routines {{{*/ void Configure(DataSet* nodes,Vertices* vertices); void CreateNodalConstraints(Vector* ys); @@ -102,5 +102,5 @@ /*}}}*/ - /*Dof Object routines {{{1*/ + /*Dof Object routines {{{*/ void DistributeDofs(int* pdofcount,int setenum); void OffsetDofs(int dofcount,int setenum); Index: /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -20,5 +20,5 @@ /*ElementMatrix constructors and destructor*/ -/*FUNCTION ElementMatrix::ElementMatrix(){{{1*/ +/*FUNCTION ElementMatrix::ElementMatrix(){{{*/ ElementMatrix::ElementMatrix(){ @@ -44,5 +44,5 @@ } /*}}}*/ -/*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke){{{1*/ +/*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke){{{*/ ElementMatrix::ElementMatrix(ElementMatrix* Ke){ @@ -52,5 +52,5 @@ } /*}}}*/ -/*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2){{{1*/ +/*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2){{{*/ ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2){ @@ -181,5 +181,5 @@ } /*}}}*/ -/*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2,ElementMatrix* Ke3){{{1*/ +/*FUNCTION ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2,ElementMatrix* Ke3){{{*/ ElementMatrix::ElementMatrix(ElementMatrix* Ke1, ElementMatrix* Ke2,ElementMatrix* Ke3){ @@ -196,5 +196,5 @@ } /*}}}*/ -/*FUNCTION ElementMatrix::ElementMatrix(Node** nodes,int numnodes,Parameters* parameters,int approximation){{{1*/ +/*FUNCTION ElementMatrix::ElementMatrix(Node** nodes,int numnodes,Parameters* parameters,int approximation){{{*/ ElementMatrix::ElementMatrix(Node** nodes,int numnodes,Parameters* parameters,int approximation){ @@ -228,5 +228,5 @@ } /*}}}*/ -/*FUNCTION ElementMatrix::~ElementMatrix(){{{1*/ +/*FUNCTION ElementMatrix::~ElementMatrix(){{{*/ ElementMatrix::~ElementMatrix(){ @@ -245,5 +245,5 @@ /*ElementMatrix specific routines: */ -/*FUNCTION ElementMatrix::AddToGlobal(Matrix* Kff, Matrix* Kfs){{{1*/ +/*FUNCTION ElementMatrix::AddToGlobal(Matrix* Kff, Matrix* Kfs){{{*/ void ElementMatrix::AddToGlobal(Matrix* Kff, Matrix* Kfs){ @@ -300,5 +300,5 @@ } /*}}}*/ -/*FUNCTION ElementMatrix::AddToGlobal(Matrix* Jff){{{1*/ +/*FUNCTION ElementMatrix::AddToGlobal(Matrix* Jff){{{*/ void ElementMatrix::AddToGlobal(Matrix* Jff){ @@ -337,5 +337,5 @@ } /*}}}*/ -/*FUNCTION ElementMatrix::CheckConsistency{{{1*/ +/*FUNCTION ElementMatrix::CheckConsistency{{{*/ void ElementMatrix::CheckConsistency(void){ /*Check element matrix values, only in debugging mode*/ @@ -350,5 +350,5 @@ } /*}}}*/ -/*FUNCTION ElementMatrix::Transpose{{{1*/ +/*FUNCTION ElementMatrix::Transpose{{{*/ void ElementMatrix::Transpose(void){ @@ -373,5 +373,5 @@ } /*}}}*/ -/*FUNCTION ElementMatrix::Echo{{{1*/ +/*FUNCTION ElementMatrix::Echo{{{*/ void ElementMatrix::Echo(void){ @@ -419,5 +419,5 @@ } /*}}}*/ -/*FUNCTION ElementMatrix::Init{{{1*/ +/*FUNCTION ElementMatrix::Init{{{*/ void ElementMatrix::Init(ElementMatrix* Ke){ @@ -483,5 +483,5 @@ } /*}}}*/ -/*FUNCTION ElementMatrix::SetDiag{{{1*/ +/*FUNCTION ElementMatrix::SetDiag{{{*/ void ElementMatrix::SetDiag(double scalar){ Index: /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.h (revision 12365) @@ -10,5 +10,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Object.h" #include "../../toolkits/toolkits.h" @@ -49,5 +49,5 @@ int* col_sglobaldoflist; - /*ElementMatrix constructors, destructors {{{1*/ + /*ElementMatrix constructors, destructors {{{*/ ElementMatrix(); ElementMatrix(ElementMatrix* Ke); @@ -57,5 +57,5 @@ ~ElementMatrix(); /*}}}*/ - /*ElementMatrix specific routines {{{1*/ + /*ElementMatrix specific routines {{{*/ void AddToGlobal(Matrix* Kff, Matrix* Kfs); void AddToGlobal(Matrix* Jff); Index: /issm/trunk-jpl/src/c/objects/Numerics/ElementVector.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Numerics/ElementVector.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Numerics/ElementVector.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -20,5 +20,5 @@ /*ElementVector constructors and destructor*/ -/*FUNCTION ElementVector::ElementVector(){{{1*/ +/*FUNCTION ElementVector::ElementVector(){{{*/ ElementVector::ElementVector(){ @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){{{1*/ +/*FUNCTION ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){{{*/ ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2){ @@ -116,5 +116,5 @@ } /*}}}*/ -/*FUNCTION ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2,ElementVector* pe3){{{1*/ +/*FUNCTION ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2,ElementVector* pe3){{{*/ ElementVector::ElementVector(ElementVector* pe1, ElementVector* pe2,ElementVector* pe3){ @@ -131,5 +131,5 @@ } /*}}}*/ -/*FUNCTION ElementVector::ElementVector(Node** nodes,int numnodes,Parameters* parameters,int approximation){{{1*/ +/*FUNCTION ElementVector::ElementVector(Node** nodes,int numnodes,Parameters* parameters,int approximation){{{*/ ElementVector::ElementVector(Node** nodes,int numnodes,Parameters* parameters,int approximation){ @@ -149,5 +149,5 @@ } /*}}}*/ -/*FUNCTION ElementVector::~ElementVector(){{{1*/ +/*FUNCTION ElementVector::~ElementVector(){{{*/ ElementVector::~ElementVector(){ @@ -160,5 +160,5 @@ /*ElementVector specific routines: */ -/*FUNCTION ElementVector::AddToGlobal(Vector* pf){{{1*/ +/*FUNCTION ElementVector::AddToGlobal(Vector* pf){{{*/ void ElementVector::AddToGlobal(Vector* pf){ @@ -184,5 +184,5 @@ } /*}}}*/ -/*FUNCTION ElementVector::InsertIntoGlobal(Vector* pf){{{1*/ +/*FUNCTION ElementVector::InsertIntoGlobal(Vector* pf){{{*/ void ElementVector::InsertIntoGlobal(Vector* pf){ @@ -205,5 +205,5 @@ } /*}}}*/ -/*FUNCTION ElementVector::CheckConsistency{{{1*/ +/*FUNCTION ElementVector::CheckConsistency{{{*/ void ElementVector::CheckConsistency(void){ /*Check element matrix values, only in debugging mode*/ @@ -216,5 +216,5 @@ } /*}}}*/ -/*FUNCTION ElementVector::Echo{{{1*/ +/*FUNCTION ElementVector::Echo{{{*/ void ElementVector::Echo(void){ @@ -238,5 +238,5 @@ } /*}}}*/ -/*FUNCTION ElementVector::Init{{{1*/ +/*FUNCTION ElementVector::Init{{{*/ void ElementVector::Init(ElementVector* pe){ @@ -264,5 +264,5 @@ } /*}}}*/ -/*FUNCTION ElementVector::SetValue{{{1*/ +/*FUNCTION ElementVector::SetValue{{{*/ void ElementVector::SetValue(double scalar){ Index: /issm/trunk-jpl/src/c/objects/Numerics/ElementVector.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Numerics/ElementVector.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Numerics/ElementVector.h (revision 12365) @@ -10,5 +10,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../Object.h" #include "../../toolkits/toolkits.h" @@ -32,5 +32,5 @@ int* fglobaldoflist; - /*ElementVector constructors, destructors {{{1*/ + /*ElementVector constructors, destructors {{{*/ ElementVector(); ElementVector(ElementVector* pe1,ElementVector* pe2); @@ -39,5 +39,5 @@ ~ElementVector(); /*}}}*/ - /*ElementVector specific routines {{{1*/ + /*ElementVector specific routines {{{*/ void AddToGlobal(Vector* pf); void InsertIntoGlobal(Vector* pf); Index: /issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Numerics/Matrix.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -23,5 +23,5 @@ /*Matrix constructors and destructor*/ -/*FUNCTION Matrix::Matrix(){{{1*/ +/*FUNCTION Matrix::Matrix(){{{*/ Matrix::Matrix(){ @@ -36,5 +36,5 @@ } /*}}}*/ -/*FUNCTION Matrix::Matrix(int M,int N){{{1*/ +/*FUNCTION Matrix::Matrix(int M,int N){{{*/ Matrix::Matrix(int M,int N){ @@ -49,5 +49,5 @@ } /*}}}*/ -/*FUNCTION Matrix::Matrix(int M,int N,double sparsity){{{1*/ +/*FUNCTION Matrix::Matrix(int M,int N,double sparsity){{{*/ Matrix::Matrix(int M,int N,double sparsity){ @@ -62,5 +62,5 @@ } /*}}}*/ -/*FUNCTION Matrix::Matrix(double* serial_mat, int M,int N,double sparsity){{{1*/ +/*FUNCTION Matrix::Matrix(double* serial_mat, int M,int N,double sparsity){{{*/ Matrix::Matrix(double* serial_mat, int M,int N,double sparsity){ @@ -89,5 +89,5 @@ } /*}}}*/ -/*FUNCTION Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode){{{1*/ +/*FUNCTION Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode){{{*/ Matrix::Matrix(int M,int N,int connectivity,int numberofdofspernode){ @@ -102,5 +102,5 @@ } /*}}}*/ -/*FUNCTION Matrix::~Matrix(){{{1*/ +/*FUNCTION Matrix::~Matrix(){{{*/ Matrix::~Matrix(){ @@ -117,5 +117,5 @@ /*Matrix specific routines: */ -/*FUNCTION Matrix::Echo{{{1*/ +/*FUNCTION Matrix::Echo{{{*/ void Matrix::Echo(void){ @@ -140,5 +140,5 @@ } /*}}}*/ -/*FUNCTION Matrix::Assemble{{{1*/ +/*FUNCTION Matrix::Assemble{{{*/ void Matrix::Assemble(void){ #ifdef _HAVE_PETSC_ @@ -155,5 +155,5 @@ } /*}}}*/ -/*FUNCTION Matrix::Norm{{{1*/ +/*FUNCTION Matrix::Norm{{{*/ double Matrix::Norm(NormMode norm_type){ @@ -168,5 +168,5 @@ } /*}}}*/ -/*FUNCTION Matrix::GetSize{{{1*/ +/*FUNCTION Matrix::GetSize{{{*/ void Matrix::GetSize(int* pM,int* pN){ @@ -179,5 +179,5 @@ } /*}}}*/ -/*FUNCTION Matrix::GetLocalSize{{{1*/ +/*FUNCTION Matrix::GetLocalSize{{{*/ void Matrix::GetLocalSize(int* pM,int* pN){ @@ -190,5 +190,5 @@ } /*}}}*/ -/*FUNCTION Matrix::MatMult{{{1*/ +/*FUNCTION Matrix::MatMult{{{*/ void Matrix::MatMult(Vector* X,Vector* AX){ @@ -202,5 +202,5 @@ } /*}}}*/ -/*FUNCTION Matrix::Duplicate{{{1*/ +/*FUNCTION Matrix::Duplicate{{{*/ Matrix* Matrix::Duplicate(void){ @@ -219,5 +219,5 @@ } /*}}}*/ -/*FUNCTION Matrix::ToSerial{{{1*/ +/*FUNCTION Matrix::ToSerial{{{*/ double* Matrix::ToSerial(void){ @@ -232,5 +232,5 @@ } /*}}}*/ -/*FUNCTION Matrix::SetValues{{{1*/ +/*FUNCTION Matrix::SetValues{{{*/ void Matrix::SetValues(int m,int* idxm,int n,int* idxn,double* values,InsMode mode){ @@ -242,5 +242,5 @@ } /*}}}*/ -/*FUNCTION Matrix::Convert{{{1*/ +/*FUNCTION Matrix::Convert{{{*/ void Matrix::Convert(MatrixType type){ Index: /issm/trunk-jpl/src/c/objects/Numerics/Matrix.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Numerics/Matrix.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Numerics/Matrix.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -38,5 +38,5 @@ #endif - /*Matrix constructors, destructors {{{1*/ + /*Matrix constructors, destructors {{{*/ Matrix(); Matrix(int M,int N); @@ -46,5 +46,5 @@ ~Matrix(); /*}}}*/ - /*Matrix specific routines {{{1*/ + /*Matrix specific routines {{{*/ void Echo(void); void Assemble(void); Index: /issm/trunk-jpl/src/c/objects/Numerics/Vector.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Numerics/Vector.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Numerics/Vector.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -22,5 +22,5 @@ /*Vector constructors and destructor*/ -/*FUNCTION Vector::Vector(){{{1*/ +/*FUNCTION Vector::Vector(){{{*/ Vector::Vector(){ @@ -35,5 +35,5 @@ } /*}}}*/ -/*FUNCTION Vector::Vector(int M,bool fromlocalsize){{{1*/ +/*FUNCTION Vector::Vector(int M,bool fromlocalsize){{{*/ Vector::Vector(int pM,bool fromlocalsize){ @@ -48,5 +48,5 @@ } /*}}}*/ -/*FUNCTION Vector::Vector(double* serial_vec,int M){{{1*/ +/*FUNCTION Vector::Vector(double* serial_vec,int M){{{*/ Vector::Vector(double* serial_vec,int M){ @@ -70,5 +70,5 @@ /*}}}*/ #ifdef _HAVE_PETSC_ -/*FUNCTION Vector::Vector(Vec petsc_vec){{{1*/ +/*FUNCTION Vector::Vector(Vec petsc_vec){{{*/ Vector::Vector(Vec petsc_vec){ @@ -86,5 +86,5 @@ #endif #if defined(_HAVE_GSL_) && !defined(_HAVE_PETSC_) -/*FUNCTION Vector::Vector(SeqVec* seq_vec){{{1*/ +/*FUNCTION Vector::Vector(SeqVec* seq_vec){{{*/ Vector::Vector(SeqVec* seq_vec){ @@ -100,5 +100,5 @@ #endif - /*FUNCTION Vector::~Vector(){{{1*/ + /*FUNCTION Vector::~Vector(){{{*/ Vector::~Vector(){ @@ -115,5 +115,5 @@ /*Vector specific routines: */ -/*FUNCTION Vector::Echo{{{1*/ +/*FUNCTION Vector::Echo{{{*/ void Vector::Echo(void){ @@ -132,5 +132,5 @@ } /*}}}*/ -/*FUNCTION Vector::Assemble{{{1*/ +/*FUNCTION Vector::Assemble{{{*/ void Vector::Assemble(void){ @@ -145,5 +145,5 @@ } /*}}}*/ -/*FUNCTION Vector::SetValues{{{1*/ +/*FUNCTION Vector::SetValues{{{*/ void Vector::SetValues(int ssize, int* list, double* values, InsMode mode){ @@ -158,5 +158,5 @@ } /*}}}*/ -/*FUNCTION Vector::SetValue{{{1*/ +/*FUNCTION Vector::SetValue{{{*/ void Vector::SetValue(int dof, double value, InsMode mode){ @@ -170,5 +170,5 @@ } /*}}}*/ -/*FUNCTION Vector::GetValue{{{1*/ +/*FUNCTION Vector::GetValue{{{*/ void Vector::GetValue(double* pvalue,int dof){ @@ -181,5 +181,5 @@ } /*}}}*/ -/*FUNCTION Vector::GetSize{{{1*/ +/*FUNCTION Vector::GetSize{{{*/ void Vector::GetSize(int* pM){ @@ -193,5 +193,5 @@ } /*}}}*/ -/*FUNCTION Vector::IsEmpty{{{1*/ +/*FUNCTION Vector::IsEmpty{{{*/ bool Vector::IsEmpty(void){ @@ -207,5 +207,5 @@ } /*}}}*/ -/*FUNCTION Vector::GetLocalSize{{{1*/ +/*FUNCTION Vector::GetLocalSize{{{*/ void Vector::GetLocalSize(int* pM){ @@ -219,5 +219,5 @@ } /*}}}*/ -/*FUNCTION Vector::Duplicate{{{1*/ +/*FUNCTION Vector::Duplicate{{{*/ Vector* Vector::Duplicate(void){ @@ -237,5 +237,5 @@ } /*}}}*/ -/*FUNCTION Vector::Set{{{1*/ +/*FUNCTION Vector::Set{{{*/ void Vector::Set(double value){ @@ -249,5 +249,5 @@ } /*}}}*/ -/*FUNCTION Vector::AXPY{{{1*/ +/*FUNCTION Vector::AXPY{{{*/ void Vector::AXPY(Vector* X, double a){ @@ -260,5 +260,5 @@ } /*}}}*/ -/*FUNCTION Vector::AYPX{{{1*/ +/*FUNCTION Vector::AYPX{{{*/ void Vector::AYPX(Vector* X, double a){ @@ -272,5 +272,5 @@ } /*}}}*/ -/*FUNCTION Vector::ToMPISerial{{{1*/ +/*FUNCTION Vector::ToMPISerial{{{*/ double* Vector::ToMPISerial(void){ @@ -287,5 +287,5 @@ } /*}}}*/ -/*FUNCTION Vector::Copy{{{1*/ +/*FUNCTION Vector::Copy{{{*/ void Vector::Copy(Vector* to){ @@ -298,5 +298,5 @@ } /*}}}*/ -/*FUNCTION Vector::Norm{{{1*/ +/*FUNCTION Vector::Norm{{{*/ double Vector::Norm(NormMode norm_type){ @@ -311,5 +311,5 @@ } /*}}}*/ -/*FUNCTION Vector::Scale{{{1*/ +/*FUNCTION Vector::Scale{{{*/ void Vector::Scale(double scale_factor){ @@ -322,5 +322,5 @@ } /*}}}*/ -/*FUNCTION Vector::Dot{{{1*/ +/*FUNCTION Vector::Dot{{{*/ double Vector::Dot(Vector* vector){ @@ -335,5 +335,5 @@ } /*}}}*/ -/*FUNCTION Vector::PointwiseDivide{{{1*/ +/*FUNCTION Vector::PointwiseDivide{{{*/ void Vector::PointwiseDivide(Vector* x,Vector* y){ Index: /issm/trunk-jpl/src/c/objects/Numerics/Vector.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Numerics/Vector.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Numerics/Vector.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -36,5 +36,5 @@ #endif - /*Vector constructors, destructors {{{1*/ + /*Vector constructors, destructors {{{*/ Vector(); Vector(int M,bool fromlocalsize=false); @@ -48,5 +48,5 @@ ~Vector(); /*}}}*/ - /*Vector specific routines {{{1*/ + /*Vector specific routines {{{*/ void Echo(void); void AXPY(Vector *X, double a); Index: /issm/trunk-jpl/src/c/objects/Options/Option.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/Option.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/Option.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION Option::Option(){{{1*/ +/*FUNCTION Option::Option(){{{*/ Option::Option(){ @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION Option::~Option(){{{1*/ +/*FUNCTION Option::~Option(){{{*/ Option::~Option(){ @@ -41,5 +41,5 @@ /*Other*/ -/*FUNCTION Option::Echo {{{1*/ +/*FUNCTION Option::Echo {{{*/ void Option::Echo(){ @@ -57,5 +57,5 @@ } /*}}}*/ -/*FUNCTION Option::DeepEcho() {{{1*/ +/*FUNCTION Option::DeepEcho() {{{*/ void Option::DeepEcho(){ @@ -67,5 +67,5 @@ } /*}}}*/ -/*FUNCTION Option::DeepEcho(char* indent) {{{1*/ +/*FUNCTION Option::DeepEcho(char* indent) {{{*/ void Option::DeepEcho(char* indent){ @@ -83,5 +83,5 @@ } /*}}}*/ -/*FUNCTION Option::Name {{{1*/ +/*FUNCTION Option::Name {{{*/ char* Option::Name(){ @@ -89,5 +89,5 @@ } /*}}}*/ -/*FUNCTION Option::NumEl {{{1*/ +/*FUNCTION Option::NumEl {{{*/ int Option::NumEl(){ @@ -95,5 +95,5 @@ } /*}}}*/ -/*FUNCTION Option::NDims {{{1*/ +/*FUNCTION Option::NDims {{{*/ int Option::NDims(){ @@ -101,5 +101,5 @@ } /*}}}*/ -/*FUNCTION Option::Size {{{1*/ +/*FUNCTION Option::Size {{{*/ int* Option::Size(){ @@ -107,5 +107,5 @@ } /*}}}*/ -/*FUNCTION Option::Get {{{1*/ +/*FUNCTION Option::Get {{{*/ //void* Option::Get(){ Index: /issm/trunk-jpl/src/c/objects/Options/Option.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/Option.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/Option.h (revision 12365) @@ -6,5 +6,5 @@ #define _OPTIONOBJECT_H_ -/*Headers:{{{1*/ +/*Headers:{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -23,9 +23,9 @@ int* size; - /*Option constructors, destructors {{{1*/ + /*Option constructors, destructors {{{*/ Option(); ~Option(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ virtual void Echo(); virtual void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/Options/OptionCell.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionCell.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionCell.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION OptionCell::OptionCell(){{{1*/ +/*FUNCTION OptionCell::OptionCell(){{{*/ OptionCell::OptionCell(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION OptionCell::~OptionCell(){{{1*/ +/*FUNCTION OptionCell::~OptionCell(){{{*/ OptionCell::~OptionCell(){ @@ -40,5 +40,5 @@ /*Other*/ -/*FUNCTION OptionCell::Echo {{{1*/ +/*FUNCTION OptionCell::Echo {{{*/ void OptionCell::Echo(){ @@ -56,5 +56,5 @@ } /*}}}*/ -/*FUNCTION OptionCell::DeepEcho() {{{1*/ +/*FUNCTION OptionCell::DeepEcho() {{{*/ void OptionCell::DeepEcho(){ @@ -66,5 +66,5 @@ } /*}}}*/ -/*FUNCTION OptionCell::DeepEcho(char* indent) {{{1*/ +/*FUNCTION OptionCell::DeepEcho(char* indent) {{{*/ void OptionCell::DeepEcho(char* indent){ @@ -95,5 +95,5 @@ } /*}}}*/ -/*FUNCTION OptionCell::Name {{{1*/ +/*FUNCTION OptionCell::Name {{{*/ char* OptionCell::Name(){ @@ -101,5 +101,5 @@ } /*}}}*/ -/*FUNCTION OptionCell::NumEl {{{1*/ +/*FUNCTION OptionCell::NumEl {{{*/ int OptionCell::NumEl(){ @@ -107,5 +107,5 @@ } /*}}}*/ -/*FUNCTION OptionCell::NDims {{{1*/ +/*FUNCTION OptionCell::NDims {{{*/ int OptionCell::NDims(){ @@ -113,5 +113,5 @@ } /*}}}*/ -/*FUNCTION OptionCell::Size {{{1*/ +/*FUNCTION OptionCell::Size {{{*/ int* OptionCell::Size(){ @@ -119,5 +119,5 @@ } /*}}}*/ -/*FUNCTION OptionCell::Get(Options** pvalue) {{{1*/ +/*FUNCTION OptionCell::Get(Options** pvalue) {{{*/ void OptionCell::Get(Options** pvalue){ Index: /issm/trunk-jpl/src/c/objects/Options/OptionCell.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionCell.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionCell.h (revision 12365) @@ -6,5 +6,5 @@ #define _OPTIONCELL_H_ -/*Headers:{{{1*/ +/*Headers:{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -20,9 +20,9 @@ Options* values; - /*OptionCell constructors, destructors {{{1*/ + /*OptionCell constructors, destructors {{{*/ OptionCell(); ~OptionCell(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/Options/OptionChar.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionChar.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionChar.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION OptionChar::OptionChar(){{{1*/ +/*FUNCTION OptionChar::OptionChar(){{{*/ OptionChar::OptionChar(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION OptionChar::~OptionChar(){{{1*/ +/*FUNCTION OptionChar::~OptionChar(){{{*/ OptionChar::~OptionChar(){ @@ -37,5 +37,5 @@ /*Other*/ -/*FUNCTION OptionChar::Echo {{{1*/ +/*FUNCTION OptionChar::Echo {{{*/ void OptionChar::Echo(){ @@ -60,5 +60,5 @@ } /*}}}*/ -/*FUNCTION OptionChar::DeepEcho() {{{1*/ +/*FUNCTION OptionChar::DeepEcho() {{{*/ void OptionChar::DeepEcho(){ @@ -70,5 +70,5 @@ } /*}}}*/ -/*FUNCTION OptionChar::DeepEcho(char* indent) {{{1*/ +/*FUNCTION OptionChar::DeepEcho(char* indent) {{{*/ void OptionChar::DeepEcho(char* indent){ @@ -106,5 +106,5 @@ } /*}}}*/ -/*FUNCTION OptionChar::Name {{{1*/ +/*FUNCTION OptionChar::Name {{{*/ char* OptionChar::Name(){ @@ -112,5 +112,5 @@ } /*}}}*/ -/*FUNCTION OptionChar::NumEl {{{1*/ +/*FUNCTION OptionChar::NumEl {{{*/ int OptionChar::NumEl(){ @@ -118,5 +118,5 @@ } /*}}}*/ -/*FUNCTION OptionChar::NDims {{{1*/ +/*FUNCTION OptionChar::NDims {{{*/ int OptionChar::NDims(){ @@ -124,5 +124,5 @@ } /*}}}*/ -/*FUNCTION OptionChar::Size {{{1*/ +/*FUNCTION OptionChar::Size {{{*/ int* OptionChar::Size(){ @@ -130,5 +130,5 @@ } /*}}}*/ -/*FUNCTION OptionChar::Get(char** pvalue) {{{1*/ +/*FUNCTION OptionChar::Get(char** pvalue) {{{*/ void OptionChar::Get(char** pvalue){ @@ -144,5 +144,5 @@ } /*}}}*/ -/*FUNCTION OptionChar::Get(char*** ppvalue,int *pnumel) {{{1*/ +/*FUNCTION OptionChar::Get(char*** ppvalue,int *pnumel) {{{*/ void OptionChar::Get(char*** ppvalue,int *pnumel){ Index: /issm/trunk-jpl/src/c/objects/Options/OptionChar.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionChar.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionChar.h (revision 12365) @@ -6,5 +6,5 @@ #define _OPTIONCHAR_H_ -/*Headers:{{{1*/ +/*Headers:{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -20,9 +20,9 @@ char* values; - /*OptionChar constructors, destructors {{{1*/ + /*OptionChar constructors, destructors {{{*/ OptionChar(); ~OptionChar(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/Options/OptionDouble.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionDouble.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionDouble.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION OptionDouble::OptionDouble(){{{1*/ +/*FUNCTION OptionDouble::OptionDouble(){{{*/ OptionDouble::OptionDouble(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION OptionDouble::~OptionDouble(){{{1*/ +/*FUNCTION OptionDouble::~OptionDouble(){{{*/ OptionDouble::~OptionDouble(){ @@ -37,5 +37,5 @@ /*Other*/ -/*FUNCTION OptionDouble::Echo {{{1*/ +/*FUNCTION OptionDouble::Echo {{{*/ void OptionDouble::Echo(){ @@ -56,5 +56,5 @@ } /*}}}*/ -/*FUNCTION OptionDouble::DeepEcho() {{{1*/ +/*FUNCTION OptionDouble::DeepEcho() {{{*/ void OptionDouble::DeepEcho(){ @@ -66,5 +66,5 @@ } /*}}}*/ -/*FUNCTION OptionDouble::DeepEcho(char* indent) {{{1*/ +/*FUNCTION OptionDouble::DeepEcho(char* indent) {{{*/ void OptionDouble::DeepEcho(char* indent){ @@ -96,5 +96,5 @@ } /*}}}*/ -/*FUNCTION OptionDouble::Name {{{1*/ +/*FUNCTION OptionDouble::Name {{{*/ char* OptionDouble::Name(){ @@ -102,5 +102,5 @@ } /*}}}*/ -/*FUNCTION OptionDouble::NumEl {{{1*/ +/*FUNCTION OptionDouble::NumEl {{{*/ int OptionDouble::NumEl(){ @@ -108,5 +108,5 @@ } /*}}}*/ -/*FUNCTION OptionDouble::NDims {{{1*/ +/*FUNCTION OptionDouble::NDims {{{*/ int OptionDouble::NDims(){ @@ -114,5 +114,5 @@ } /*}}}*/ -/*FUNCTION OptionDouble::Size {{{1*/ +/*FUNCTION OptionDouble::Size {{{*/ int* OptionDouble::Size(){ @@ -120,5 +120,5 @@ } /*}}}*/ -/*FUNCTION OptionDouble::Get(int* pvalue) {{{1*/ +/*FUNCTION OptionDouble::Get(int* pvalue) {{{*/ void OptionDouble::Get(int* pvalue){ @@ -132,5 +132,5 @@ } /*}}}*/ -/*FUNCTION OptionDouble::Get(double* pvalue) {{{1*/ +/*FUNCTION OptionDouble::Get(double* pvalue) {{{*/ void OptionDouble::Get(double* pvalue){ @@ -144,5 +144,5 @@ } /*}}}*/ -/*FUNCTION OptionDouble::Get(double** pvalue,int* numel) {{{1*/ +/*FUNCTION OptionDouble::Get(double** pvalue,int* numel) {{{*/ void OptionDouble::Get(double** pvalue,int* numel){ Index: /issm/trunk-jpl/src/c/objects/Options/OptionDouble.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionDouble.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionDouble.h (revision 12365) @@ -6,5 +6,5 @@ #define _OPTIONDOUBLE_H_ -/*Headers:{{{1*/ +/*Headers:{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -20,9 +20,9 @@ double* values; - /*OptionDouble constructors, destructors {{{1*/ + /*OptionDouble constructors, destructors {{{*/ OptionDouble(); ~OptionDouble(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/Options/OptionLogical.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionLogical.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionLogical.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION OptionLogical::OptionLogical(){{{1*/ +/*FUNCTION OptionLogical::OptionLogical(){{{*/ OptionLogical::OptionLogical(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION OptionLogical::~OptionLogical(){{{1*/ +/*FUNCTION OptionLogical::~OptionLogical(){{{*/ OptionLogical::~OptionLogical(){ @@ -37,5 +37,5 @@ /*Other*/ -/*FUNCTION OptionLogical::Echo {{{1*/ +/*FUNCTION OptionLogical::Echo {{{*/ void OptionLogical::Echo(){ @@ -56,5 +56,5 @@ } /*}}}*/ -/*FUNCTION OptionLogical::DeepEcho() {{{1*/ +/*FUNCTION OptionLogical::DeepEcho() {{{*/ void OptionLogical::DeepEcho(){ @@ -66,5 +66,5 @@ } /*}}}*/ -/*FUNCTION OptionLogical::DeepEcho(char* indent) {{{1*/ +/*FUNCTION OptionLogical::DeepEcho(char* indent) {{{*/ void OptionLogical::DeepEcho(char* indent){ @@ -96,5 +96,5 @@ } /*}}}*/ -/*FUNCTION OptionLogical::Name {{{1*/ +/*FUNCTION OptionLogical::Name {{{*/ char* OptionLogical::Name(){ @@ -102,5 +102,5 @@ } /*}}}*/ -/*FUNCTION OptionLogical::NumEl {{{1*/ +/*FUNCTION OptionLogical::NumEl {{{*/ int OptionLogical::NumEl(){ @@ -108,5 +108,5 @@ } /*}}}*/ -/*FUNCTION OptionLogical::NDims {{{1*/ +/*FUNCTION OptionLogical::NDims {{{*/ int OptionLogical::NDims(){ @@ -114,5 +114,5 @@ } /*}}}*/ -/*FUNCTION OptionLogical::Size {{{1*/ +/*FUNCTION OptionLogical::Size {{{*/ int* OptionLogical::Size(){ @@ -120,5 +120,5 @@ } /*}}}*/ -/*FUNCTION OptionLogical::Get(bool* pvalue) {{{1*/ +/*FUNCTION OptionLogical::Get(bool* pvalue) {{{*/ void OptionLogical::Get(bool* pvalue){ Index: /issm/trunk-jpl/src/c/objects/Options/OptionLogical.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionLogical.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionLogical.h (revision 12365) @@ -6,5 +6,5 @@ #define _OPTIONLOGICAL_H_ -/*Headers:{{{1*/ +/*Headers:{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -20,9 +20,9 @@ bool* values; - /*OptionLogical constructors, destructors {{{1*/ + /*OptionLogical constructors, destructors {{{*/ OptionLogical(); ~OptionLogical(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/Options/OptionStruct.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionStruct.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionStruct.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,5 +21,5 @@ /*Constructors/destructor/copy*/ -/*FUNCTION OptionStruct::OptionStruct(){{{1*/ +/*FUNCTION OptionStruct::OptionStruct(){{{*/ OptionStruct::OptionStruct(){ @@ -28,5 +28,5 @@ } /*}}}*/ -/*FUNCTION OptionStruct::~OptionStruct(){{{1*/ +/*FUNCTION OptionStruct::~OptionStruct(){{{*/ OptionStruct::~OptionStruct(){ @@ -45,5 +45,5 @@ /*Other*/ -/*FUNCTION OptionStruct::Echo {{{1*/ +/*FUNCTION OptionStruct::Echo {{{*/ void OptionStruct::Echo(){ @@ -61,5 +61,5 @@ } /*}}}*/ -/*FUNCTION OptionStruct::DeepEcho() {{{1*/ +/*FUNCTION OptionStruct::DeepEcho() {{{*/ void OptionStruct::DeepEcho(){ @@ -71,5 +71,5 @@ } /*}}}*/ -/*FUNCTION OptionStruct::DeepEcho(char* indent) {{{1*/ +/*FUNCTION OptionStruct::DeepEcho(char* indent) {{{*/ void OptionStruct::DeepEcho(char* indent){ @@ -103,5 +103,5 @@ } /*}}}*/ -/*FUNCTION OptionStruct::Name {{{1*/ +/*FUNCTION OptionStruct::Name {{{*/ char* OptionStruct::Name(){ @@ -109,5 +109,5 @@ } /*}}}*/ -/*FUNCTION OptionStruct::NumEl {{{1*/ +/*FUNCTION OptionStruct::NumEl {{{*/ int OptionStruct::NumEl(){ @@ -115,5 +115,5 @@ } /*}}}*/ -/*FUNCTION OptionStruct::NDims {{{1*/ +/*FUNCTION OptionStruct::NDims {{{*/ int OptionStruct::NDims(){ @@ -121,5 +121,5 @@ } /*}}}*/ -/*FUNCTION OptionStruct::Size {{{1*/ +/*FUNCTION OptionStruct::Size {{{*/ int* OptionStruct::Size(){ @@ -127,5 +127,5 @@ } /*}}}*/ -/*FUNCTION OptionStruct::Get(Options** pvalue) {{{1*/ +/*FUNCTION OptionStruct::Get(Options** pvalue) {{{*/ void OptionStruct::Get(Options** pvalue){ @@ -139,5 +139,5 @@ } /*}}}*/ -/*FUNCTION OptionStruct::Get(Options*** ppvalue,int* numel) {{{1*/ +/*FUNCTION OptionStruct::Get(Options*** ppvalue,int* numel) {{{*/ void OptionStruct::Get(Options*** ppvalue,int* numel){ Index: /issm/trunk-jpl/src/c/objects/Options/OptionStruct.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionStruct.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionStruct.h (revision 12365) @@ -6,5 +6,5 @@ #define _OPTIONSTRUCT_H_ -/*Headers:{{{1*/ +/*Headers:{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" @@ -20,9 +20,9 @@ Options** values; - /*OptionStruct constructors, destructors {{{1*/ + /*OptionStruct constructors, destructors {{{*/ OptionStruct(); ~OptionStruct(); /*}}}*/ - /*Object virtual functions definitions:{{{1*/ + /*Object virtual functions definitions:{{{*/ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/Options/OptionUtilities.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionUtilities.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionUtilities.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -19,5 +19,5 @@ /*}}}*/ -/*FUNCTION ColumnWiseDimsFromIndex{{{1*/ +/*FUNCTION ColumnWiseDimsFromIndex{{{*/ int ColumnWiseDimsFromIndex(int* dims,int index,int* size,int ndims){ @@ -38,5 +38,5 @@ return(0); }/*}}}*/ -/*FUNCTION IndexFromColumnWiseDims{{{1*/ +/*FUNCTION IndexFromColumnWiseDims{{{*/ int IndexFromColumnWiseDims(int* dims, int* size, int ndims) { @@ -57,5 +57,5 @@ return(index); }/*}}}*/ -/*FUNCTION RowWiseDimsFromIndex{{{1*/ +/*FUNCTION RowWiseDimsFromIndex{{{*/ int RowWiseDimsFromIndex(int* dims, int index, int* size, int ndims) { @@ -76,5 +76,5 @@ return(0); }/*}}}*/ -/*FUNCTION IndexFromRowWiseDims{{{1*/ +/*FUNCTION IndexFromRowWiseDims{{{*/ int IndexFromRowWiseDims(int* dims, int* size, int ndims) { @@ -95,5 +95,5 @@ return(index); }/*}}}*/ -/*FUNCTION StringFromDims{{{1*/ +/*FUNCTION StringFromDims{{{*/ int StringFromDims(char* cstr, int* dims, int ndims) { @@ -104,5 +104,5 @@ return(0); }/*}}}*/ -/*FUNCTION StringFromSize{{{1*/ +/*FUNCTION StringFromSize{{{*/ int StringFromSize(char* cstr, int* size, int ndims) { Index: /issm/trunk-jpl/src/c/objects/Options/OptionUtilities.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Options/OptionUtilities.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Options/OptionUtilities.h (revision 12365) @@ -6,5 +6,5 @@ #define _OPTIONUTILITIES_H_ -/*Headers:{{{1*/ +/*Headers:{{{*/ #include "../../include/include.h" #include "../../shared/Exceptions/exceptions.h" Index: /issm/trunk-jpl/src/c/objects/Params/BoolParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/BoolParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/BoolParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*BoolParam constructors and destructor*/ -/*FUNCTION BoolParam::BoolParam(){{{1*/ +/*FUNCTION BoolParam::BoolParam(){{{*/ BoolParam::BoolParam(){ return; } /*}}}*/ -/*FUNCTION BoolParam::BoolParam(int enum_type,IssmBool value){{{1*/ +/*FUNCTION BoolParam::BoolParam(int enum_type,IssmBool value){{{*/ BoolParam::BoolParam(int in_enum_type,IssmBool in_value){ @@ -33,5 +33,5 @@ } /*}}}*/ -/*FUNCTION BoolParam::~BoolParam(){{{1*/ +/*FUNCTION BoolParam::~BoolParam(){{{*/ BoolParam::~BoolParam(){ return; @@ -40,10 +40,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION BoolParam::Echo {{{1*/ +/*FUNCTION BoolParam::Echo {{{*/ void BoolParam::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION BoolParam::DeepEcho{{{1*/ +/*FUNCTION BoolParam::DeepEcho{{{*/ void BoolParam::DeepEcho(void){ @@ -53,8 +53,8 @@ } /*}}}*/ -/*FUNCTION BoolParam::Id{{{1*/ +/*FUNCTION BoolParam::Id{{{*/ int BoolParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION BoolParam::MyRank{{{1*/ +/*FUNCTION BoolParam::MyRank{{{*/ int BoolParam::MyRank(void){ extern int my_rank; @@ -62,5 +62,5 @@ } /*}}}*/ -/*FUNCTION BoolParam::ObjectEnum{{{1*/ +/*FUNCTION BoolParam::ObjectEnum{{{*/ int BoolParam::ObjectEnum(void){ @@ -69,5 +69,5 @@ } /*}}}*/ -/*FUNCTION BoolParam::copy{{{1*/ +/*FUNCTION BoolParam::copy{{{*/ Object* BoolParam::copy() { @@ -78,10 +78,10 @@ /*BoolParam virtual functions definitions: */ -/*FUNCTION BoolParam::GetParameterName{{{1*/ +/*FUNCTION BoolParam::GetParameterName{{{*/ void BoolParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION BoolParam::UnitConversion{{{1*/ +/*FUNCTION BoolParam::UnitConversion{{{*/ void BoolParam::UnitConversion(int direction_enum){ /*do nothing, no unit conversion*/ Index: /issm/trunk-jpl/src/c/objects/Params/BoolParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/BoolParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/BoolParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -27,10 +27,10 @@ IssmBool value; - /*BoolParam constructors, destructors: {{{1*/ + /*BoolParam constructors, destructors: {{{*/ BoolParam(); BoolParam(int enum_type,IssmBool value); ~BoolParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -40,5 +40,5 @@ Object* copy(); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){*pbool=value;} Index: /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*DoubleMatArrayParam constructors and destructor*/ -/*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(){{{1*/ +/*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(){{{*/ DoubleMatArrayParam::DoubleMatArrayParam(){ return; } /*}}}*/ -/*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(int enum_type,double** array, int M, int* mdim_array, int* ndim_array){{{1*/ +/*FUNCTION DoubleMatArrayParam::DoubleMatArrayParam(int enum_type,double** array, int M, int* mdim_array, int* ndim_array){{{*/ DoubleMatArrayParam::DoubleMatArrayParam(int in_enum_type,double** in_array, int in_M, int* in_mdim_array, int* in_ndim_array){ @@ -64,5 +64,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatArrayParam::~DoubleMatArrayParam(){{{1*/ +/*FUNCTION DoubleMatArrayParam::~DoubleMatArrayParam(){{{*/ DoubleMatArrayParam::~DoubleMatArrayParam(){ @@ -84,5 +84,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION DoubleMatArrayParam::Echo {{{1*/ +/*FUNCTION DoubleMatArrayParam::Echo {{{*/ void DoubleMatArrayParam::Echo(void){ @@ -94,5 +94,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatArrayParam::DeepEcho{{{1*/ +/*FUNCTION DoubleMatArrayParam::DeepEcho{{{*/ void DoubleMatArrayParam::DeepEcho(void){ @@ -118,8 +118,8 @@ } /*}}}*/ -/*FUNCTION DoubleMatArrayParam::Id{{{1*/ +/*FUNCTION DoubleMatArrayParam::Id{{{*/ int DoubleMatArrayParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleMatArrayParam::MyRank{{{1*/ +/*FUNCTION DoubleMatArrayParam::MyRank{{{*/ int DoubleMatArrayParam::MyRank(void){ extern int my_rank; @@ -127,5 +127,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatArrayParam::ObjectEnum{{{1*/ +/*FUNCTION DoubleMatArrayParam::ObjectEnum{{{*/ int DoubleMatArrayParam::ObjectEnum(void){ @@ -134,5 +134,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatArrayParam::copy{{{1*/ +/*FUNCTION DoubleMatArrayParam::copy{{{*/ Object* DoubleMatArrayParam::copy() { @@ -143,5 +143,5 @@ /*DoubleMatArrayParam virtual functions definitions: */ -/*FUNCTION DoubleMatArrayParam::GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){{{1*/ +/*FUNCTION DoubleMatArrayParam::GetParameterValue(double*** parray, int* pM,int** pmdims, int** pndims){{{*/ void DoubleMatArrayParam::GetParameterValue(double*** pout_array, int* pout_M,int** pout_mdim_array, int** pout_ndim_array){ @@ -196,10 +196,10 @@ } /*}}}*/ -/*FUNCTION DoubleMatArrayParam::GetParameterName{{{1*/ +/*FUNCTION DoubleMatArrayParam::GetParameterName{{{*/ void DoubleMatArrayParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION DoubleMatArrayParam::SetValue(double** array, int M, int* mdim_array, int* ndim_array){{{1*/ +/*FUNCTION DoubleMatArrayParam::SetValue(double** array, int M, int* mdim_array, int* ndim_array){{{*/ void DoubleMatArrayParam::SetValue(double** in_array, int in_M, int* in_mdim_array, int* in_ndim_array){ @@ -239,5 +239,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatArrayParam::UnitConversion{{{1*/ +/*FUNCTION DoubleMatArrayParam::UnitConversion{{{*/ void DoubleMatArrayParam::UnitConversion(int direction_enum){ /*go through all matrices and convert: */ Index: /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleMatArrayParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -30,10 +30,10 @@ public: - /*DoubleMatArrayParam constructors, destructors: {{{1*/ + /*DoubleMatArrayParam constructors, destructors: {{{*/ DoubleMatArrayParam(); DoubleMatArrayParam(int enum_type,double** array, int M, int* mdim_array, int* ndim_array); ~DoubleMatArrayParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -43,5 +43,5 @@ Object* copy(); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ 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));} Index: /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*DoubleMatParam constructors and destructor*/ -/*FUNCTION DoubleMatParam::DoubleMatParam(){{{1*/ +/*FUNCTION DoubleMatParam::DoubleMatParam(){{{*/ DoubleMatParam::DoubleMatParam(){ return; } /*}}}*/ -/*FUNCTION DoubleMatParam::DoubleMatParam(int enum_type,IssmDoubleMat value){{{1*/ +/*FUNCTION DoubleMatParam::DoubleMatParam(int enum_type,IssmDoubleMat value){{{*/ DoubleMatParam::DoubleMatParam(int in_enum_type,double* in_value, int in_M,int in_N){ @@ -37,5 +37,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatParam::~DoubleMatParam(){{{1*/ +/*FUNCTION DoubleMatParam::~DoubleMatParam(){{{*/ DoubleMatParam::~DoubleMatParam(){ xfree((void**)&value); @@ -45,5 +45,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION DoubleMatParam::Echo {{{1*/ +/*FUNCTION DoubleMatParam::Echo {{{*/ void DoubleMatParam::Echo(void){ @@ -54,5 +54,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatParam::DeepEcho{{{1*/ +/*FUNCTION DoubleMatParam::DeepEcho{{{*/ void DoubleMatParam::DeepEcho(void){ @@ -69,8 +69,8 @@ } /*}}}*/ -/*FUNCTION DoubleMatParam::Id{{{1*/ +/*FUNCTION DoubleMatParam::Id{{{*/ int DoubleMatParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleMatParam::MyRank{{{1*/ +/*FUNCTION DoubleMatParam::MyRank{{{*/ int DoubleMatParam::MyRank(void){ extern int my_rank; @@ -78,5 +78,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatParam::ObjectEnum{{{1*/ +/*FUNCTION DoubleMatParam::ObjectEnum{{{*/ int DoubleMatParam::ObjectEnum(void){ @@ -85,5 +85,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatParam::copy{{{1*/ +/*FUNCTION DoubleMatParam::copy{{{*/ Object* DoubleMatParam::copy() { @@ -94,5 +94,5 @@ /*DoubleMatParam virtual functions definitions: */ -/*FUNCTION DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{1*/ +/*FUNCTION DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{*/ void DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){ double* output=NULL; @@ -107,15 +107,15 @@ } /*}}}*/ -/*FUNCTION DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/ +/*FUNCTION DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{*/ void DoubleMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){ _error_("DoubleMat of enum %i (%s) cannot return an array of int",enum_type,EnumToStringx(enum_type)); } /*}}}*/ -/*FUNCTION DoubleMatParam::GetParameterName{{{1*/ +/*FUNCTION DoubleMatParam::GetParameterName{{{*/ void DoubleMatParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION DoubleMatParam::SetValue{{{1*/ +/*FUNCTION DoubleMatParam::SetValue{{{*/ void DoubleMatParam::SetValue(double* doublearray,int in_M,int in_N){ @@ -130,5 +130,5 @@ } /*}}}*/ -/*FUNCTION DoubleMatParam::UnitConversion{{{1*/ +/*FUNCTION DoubleMatParam::UnitConversion{{{*/ void DoubleMatParam::UnitConversion(int direction_enum){ ::UnitConversion(this->value,this->M*this->N,direction_enum,this->enum_type); @@ -137,5 +137,5 @@ /*diverse: */ -/*FUNCTION DoubleMatParam::GetPointer{{{1*/ +/*FUNCTION DoubleMatParam::GetPointer{{{*/ double* DoubleMatParam::GetPointer(void){ return this->value; Index: /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -29,10 +29,10 @@ public: - /*DoubleMatParam constructors, destructors: {{{1*/ + /*DoubleMatParam constructors, destructors: {{{*/ DoubleMatParam(); DoubleMatParam(int enum_type,IssmDouble* value,int M,int N); ~DoubleMatParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -42,5 +42,5 @@ Object* copy(); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ 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));} Index: /issm/trunk-jpl/src/c/objects/Params/DoubleParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleParam.cpp (revision 12365) @@ -18,10 +18,10 @@ /*DoubleParam constructors and destructor*/ -/*FUNCTION DoubleParam::DoubleParam(){{{1*/ +/*FUNCTION DoubleParam::DoubleParam(){{{*/ DoubleParam::DoubleParam(){ return; } /*}}}*/ -/*FUNCTION DoubleParam::DoubleParam(int enum_type,IssmDouble value){{{1*/ +/*FUNCTION DoubleParam::DoubleParam(int enum_type,IssmDouble value){{{*/ DoubleParam::DoubleParam(int in_enum_type,IssmDouble in_value){ @@ -30,5 +30,5 @@ } /*}}}*/ -/*FUNCTION DoubleParam::~DoubleParam(){{{1*/ +/*FUNCTION DoubleParam::~DoubleParam(){{{*/ DoubleParam::~DoubleParam(){ return; @@ -37,10 +37,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION DoubleParam::Echo {{{1*/ +/*FUNCTION DoubleParam::Echo {{{*/ void DoubleParam::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION DoubleParam::DeepEcho{{{1*/ +/*FUNCTION DoubleParam::DeepEcho{{{*/ void DoubleParam::DeepEcho(void){ @@ -50,8 +50,8 @@ } /*}}}*/ -/*FUNCTION DoubleParam::Id{{{1*/ +/*FUNCTION DoubleParam::Id{{{*/ int DoubleParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleParam::MyRank{{{1*/ +/*FUNCTION DoubleParam::MyRank{{{*/ int DoubleParam::MyRank(void){ extern int my_rank; @@ -59,5 +59,5 @@ } /*}}}*/ -/*FUNCTION DoubleParam::ObjectEnum{{{1*/ +/*FUNCTION DoubleParam::ObjectEnum{{{*/ int DoubleParam::ObjectEnum(void){ @@ -66,5 +66,5 @@ } /*}}}*/ -/*FUNCTION DoubleParam::copy{{{1*/ +/*FUNCTION DoubleParam::copy{{{*/ Object* DoubleParam::copy() { @@ -75,40 +75,40 @@ /*DoubleParam virtual functions definitions: */ -/*FUNCTION DoubleParam::GetParameterName{{{1*/ +/*FUNCTION DoubleParam::GetParameterName{{{*/ void DoubleParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION DoubleParam::GetParameterValue(int* pinteger){{{1*/ +/*FUNCTION DoubleParam::GetParameterValue(int* pinteger){{{*/ void DoubleParam::GetParameterValue(int* pinteger){ _error_("Double param of enum %i (%s) cannot return an integer",enum_type,EnumToStringx(enum_type)); } /*}}}*/ -/*FUNCTION DoubleParam::GetParameterValue(bool* pbool){{{1*/ +/*FUNCTION DoubleParam::GetParameterValue(bool* pbool){{{*/ void DoubleParam::GetParameterValue(bool* pbool){ _error_("Double param of enum %i (%s) cannot return an bool",enum_type,EnumToStringx(enum_type)); } /*}}}*/ -/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM){{{1*/ +/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM){{{*/ void DoubleParam::GetParameterValue(int** pintarray,int* pM){ _error_("Double param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type)); } /*}}}*/ -/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{1*/ +/*FUNCTION DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){{{*/ void DoubleParam::GetParameterValue(int** pintarray,int* pM,int* pN){ _error_("Double param of enum %i (%s) cannot return an array of integers",enum_type,EnumToStringx(enum_type)); } /*}}}*/ -/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/ +/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM){{{*/ void DoubleParam::GetParameterValue(double** pdoublearray,int* pM){ _error_("Double param of enum %i (%s) cannot return an array of double",enum_type,EnumToStringx(enum_type)); } /*}}}*/ -/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{1*/ +/*FUNCTION DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){{{*/ void DoubleParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){ _error_("Double param of enum %i (%s) cannot return an array of double",enum_type,EnumToStringx(enum_type)); } /*}}}*/ -/*FUNCTION DoubleParam::UnitConversion{{{1*/ +/*FUNCTION DoubleParam::UnitConversion{{{*/ void DoubleParam::UnitConversion(int direction_enum){ ::UnitConversion(&this->value,1,direction_enum,this->enum_type); Index: /issm/trunk-jpl/src/c/objects/Params/DoubleParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -28,10 +28,10 @@ public: - /*DoubleParam constructors, destructors: {{{1*/ + /*DoubleParam constructors, destructors: {{{*/ DoubleParam(); DoubleParam(int enum_type,IssmDouble value); ~DoubleParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -41,5 +41,5 @@ Object* copy(); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool); Index: /issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -20,10 +20,10 @@ /*}}}*/ -/*FUNCTION DoubleTransientMatParam::DoubleTransientMatParam(int enum_type,IssmDoubleMat value){{{1*/ +/*FUNCTION DoubleTransientMatParam::DoubleTransientMatParam(int enum_type,IssmDoubleMat value){{{*/ DoubleTransientMatParam::DoubleTransientMatParam(int in_enum_type,double* in_value, int in_M,int in_N):DoubleMatParam(in_enum_type,in_value,in_M,in_N){ } /*}}}*/ -/*FUNCTION DoubleTransientMatParam::UnitConversion{{{1*/ +/*FUNCTION DoubleTransientMatParam::UnitConversion{{{*/ void DoubleTransientMatParam::UnitConversion(int direction_enum){ ::UnitConversion(this->value,(this->M-1)*this->N,direction_enum,this->enum_type); Index: /issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleTransientMatParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -23,8 +23,8 @@ public: - /*DoubleTransientMatParam constructors, destructors: {{{1*/ + /*DoubleTransientMatParam constructors, destructors: {{{*/ DoubleTransientMatParam(int enum_type,IssmDouble* value,int M,int N); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ void UnitConversion(int direction_enum); /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*DoubleVecParam constructors and destructor*/ -/*FUNCTION DoubleVecParam::DoubleVecParam(){{{1*/ +/*FUNCTION DoubleVecParam::DoubleVecParam(){{{*/ DoubleVecParam::DoubleVecParam(){ return; } /*}}}*/ -/*FUNCTION DoubleVecParam::DoubleVecParam(int enum_type,IssmDoubleVec values,int M){{{1*/ +/*FUNCTION DoubleVecParam::DoubleVecParam(int enum_type,IssmDoubleVec values,int M){{{*/ DoubleVecParam::DoubleVecParam(int in_enum_type,double* in_values, int in_M){ @@ -36,5 +36,5 @@ } /*}}}*/ -/*FUNCTION DoubleVecParam::~DoubleVecParam(){{{1*/ +/*FUNCTION DoubleVecParam::~DoubleVecParam(){{{*/ DoubleVecParam::~DoubleVecParam(){ xfree((void**)&values); @@ -44,5 +44,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION DoubleVecParam::Echo {{{1*/ +/*FUNCTION DoubleVecParam::Echo {{{*/ void DoubleVecParam::Echo(void){ @@ -53,5 +53,5 @@ } /*}}}*/ -/*FUNCTION DoubleVecParam::DeepEcho{{{1*/ +/*FUNCTION DoubleVecParam::DeepEcho{{{*/ void DoubleVecParam::DeepEcho(void){ @@ -66,8 +66,8 @@ } /*}}}*/ -/*FUNCTION DoubleVecParam::Id{{{1*/ +/*FUNCTION DoubleVecParam::Id{{{*/ int DoubleVecParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION DoubleVecParam::MyRank{{{1*/ +/*FUNCTION DoubleVecParam::MyRank{{{*/ int DoubleVecParam::MyRank(void){ extern int my_rank; @@ -75,5 +75,5 @@ } /*}}}*/ -/*FUNCTION DoubleVecParam::ObjectEnum{{{1*/ +/*FUNCTION DoubleVecParam::ObjectEnum{{{*/ int DoubleVecParam::ObjectEnum(void){ @@ -82,5 +82,5 @@ } /*}}}*/ -/*FUNCTION DoubleVecParam::copy{{{1*/ +/*FUNCTION DoubleVecParam::copy{{{*/ Object* DoubleVecParam::copy() { @@ -91,5 +91,5 @@ /*DoubleVecParam virtual functions definitions: */ -/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/ +/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{*/ void DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){ double* output=NULL; @@ -105,5 +105,5 @@ } /*}}}*/ -/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{1*/ +/*FUNCTION DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM){{{*/ void DoubleVecParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){ double* output=NULL; @@ -122,15 +122,15 @@ } /*}}}*/ -/*FUNCTION DoubleVecParam::GetParameterValue(int** pintarray,int* pM){{{1*/ +/*FUNCTION DoubleVecParam::GetParameterValue(int** pintarray,int* pM){{{*/ void DoubleVecParam::GetParameterValue(int** pintarray,int* pM){ _error_("DoubleVec param of enum %i (%s) cannot return an array of int",enum_type,EnumToStringx(enum_type)); } /*}}}*/ -/*FUNCTION DoubleVecParam::GetParameterName{{{1*/ +/*FUNCTION DoubleVecParam::GetParameterName{{{*/ void DoubleVecParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION DoubleVecParam::SetValue{{{1*/ +/*FUNCTION DoubleVecParam::SetValue{{{*/ void DoubleVecParam::SetValue(double* doublearray,int in_M){ @@ -144,5 +144,5 @@ } /*}}}*/ -/*FUNCTION DoubleVecParam::UnitConversion{{{1*/ +/*FUNCTION DoubleVecParam::UnitConversion{{{*/ void DoubleVecParam::UnitConversion(int direction_enum){ ::UnitConversion(this->values,this->M,direction_enum,this->enum_type); Index: /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -28,10 +28,10 @@ public: - /*DoubleVecParam constructors, destructors: {{{1*/ + /*DoubleVecParam constructors, destructors: {{{*/ DoubleVecParam(); DoubleVecParam(int enum_type,IssmDouble* values,int M); ~DoubleVecParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -41,5 +41,5 @@ Object* copy(); /*}}}*/ - /*Param virtual functions definitions: {{{1*/ + /*Param virtual functions definitions: {{{*/ 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));} Index: /issm/trunk-jpl/src/c/objects/Params/FileParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/FileParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/FileParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*FileParam constructors and destructor*/ -/*FUNCTION FileParam::FileParam(){{{1*/ +/*FUNCTION FileParam::FileParam(){{{*/ FileParam::FileParam(){ return; } /*}}}*/ -/*FUNCTION FileParam::FileParam(int enum_type,FILE *value){{{1*/ +/*FUNCTION FileParam::FileParam(int enum_type,FILE *value){{{*/ FileParam::FileParam(int in_enum_type,FILE* in_value){ @@ -33,5 +33,5 @@ } /*}}}*/ -/*FUNCTION FileParam::~FileParam(){{{1*/ +/*FUNCTION FileParam::~FileParam(){{{*/ FileParam::~FileParam(){ return; @@ -40,10 +40,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION FileParam::Echo {{{1*/ +/*FUNCTION FileParam::Echo {{{*/ void FileParam::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION FileParam::DeepEcho{{{1*/ +/*FUNCTION FileParam::DeepEcho{{{*/ void FileParam::DeepEcho(void){ @@ -53,8 +53,8 @@ } /*}}}*/ -/*FUNCTION FileParam::Id{{{1*/ +/*FUNCTION FileParam::Id{{{*/ int FileParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION FileParam::MyRank{{{1*/ +/*FUNCTION FileParam::MyRank{{{*/ int FileParam::MyRank(void){ extern int my_rank; @@ -62,5 +62,5 @@ } /*}}}*/ -/*FUNCTION FileParam::ObjectEnum{{{1*/ +/*FUNCTION FileParam::ObjectEnum{{{*/ int FileParam::ObjectEnum(void){ @@ -69,5 +69,5 @@ } /*}}}*/ -/*FUNCTION FileParam::copy{{{1*/ +/*FUNCTION FileParam::copy{{{*/ Object* FileParam::copy() { @@ -78,10 +78,10 @@ /*FileParam virtual functions definitions: */ -/*FUNCTION FileParam::GetParameterName{{{1*/ +/*FUNCTION FileParam::GetParameterName{{{*/ void FileParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION FileParam::UnitConversion{{{1*/ +/*FUNCTION FileParam::UnitConversion{{{*/ void FileParam::UnitConversion(int direction_enum){ /*do nothing, no unit conversion*/ Index: /issm/trunk-jpl/src/c/objects/Params/FileParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/FileParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/FileParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -27,10 +27,10 @@ public: - /*FileParam constructors, destructors: {{{1*/ + /*FileParam constructors, destructors: {{{*/ FileParam(); FileParam(int enum_type,FILE* fid); ~FileParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -40,5 +40,5 @@ Object* copy(); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){ _error_("FileParam of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/IntMatParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*IntMatParam constructors and destructor*/ -/*FUNCTION IntMatParam::IntMatParam(){{{1*/ +/*FUNCTION IntMatParam::IntMatParam(){{{*/ IntMatParam::IntMatParam(){ return; } /*}}}*/ -/*FUNCTION IntMatParam::IntMatParam(int enum_type,IssmIntMat value){{{1*/ +/*FUNCTION IntMatParam::IntMatParam(int enum_type,IssmIntMat value){{{*/ IntMatParam::IntMatParam(int in_enum_type,int* in_value, int in_M,int in_N){ @@ -37,5 +37,5 @@ } /*}}}*/ -/*FUNCTION IntMatParam::~IntMatParam(){{{1*/ +/*FUNCTION IntMatParam::~IntMatParam(){{{*/ IntMatParam::~IntMatParam(){ xfree((void**)&value); @@ -45,5 +45,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION IntMatParam::Echo {{{1*/ +/*FUNCTION IntMatParam::Echo {{{*/ void IntMatParam::Echo(void){ @@ -54,5 +54,5 @@ } /*}}}*/ -/*FUNCTION IntMatParam::DeepEcho{{{1*/ +/*FUNCTION IntMatParam::DeepEcho{{{*/ void IntMatParam::DeepEcho(void){ @@ -69,8 +69,8 @@ } /*}}}*/ -/*FUNCTION IntMatParam::Id{{{1*/ +/*FUNCTION IntMatParam::Id{{{*/ int IntMatParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION IntMatParam::MyRank{{{1*/ +/*FUNCTION IntMatParam::MyRank{{{*/ int IntMatParam::MyRank(void){ extern int my_rank; @@ -78,5 +78,5 @@ } /*}}}*/ -/*FUNCTION IntMatParam::ObjectEnum{{{1*/ +/*FUNCTION IntMatParam::ObjectEnum{{{*/ int IntMatParam::ObjectEnum(void){ @@ -85,5 +85,5 @@ } /*}}}*/ -/*FUNCTION IntMatParam::copy{{{1*/ +/*FUNCTION IntMatParam::copy{{{*/ Object* IntMatParam::copy() { @@ -94,5 +94,5 @@ /*IntMatParam virtual functions definitions: */ -/*FUNCTION IntMatParam::GetParameterValue{{{1*/ +/*FUNCTION IntMatParam::GetParameterValue{{{*/ void IntMatParam::GetParameterValue(int** pintarray,int* pM,int* pN){ int* output=NULL; @@ -107,10 +107,10 @@ } /*}}}*/ -/*FUNCTION IntMatParam::GetParameterName{{{1*/ +/*FUNCTION IntMatParam::GetParameterName{{{*/ void IntMatParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION IntMatParam::SetValue{{{1*/ +/*FUNCTION IntMatParam::SetValue{{{*/ void IntMatParam::SetValue(int* intarray,int in_M,int in_N){ @@ -125,5 +125,5 @@ } /*}}}*/ -/*FUNCTION IntMatParam::UnitConversion{{{1*/ +/*FUNCTION IntMatParam::UnitConversion{{{*/ void IntMatParam::UnitConversion(int direction_enum){ /*do nothing, no unit conversion*/ Index: /issm/trunk-jpl/src/c/objects/Params/IntMatParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntMatParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/IntMatParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -29,10 +29,10 @@ public: - /*IntMatParam constructors, destructors: {{{1*/ + /*IntMatParam constructors, destructors: {{{*/ IntMatParam(); IntMatParam(int enum_type,int* value,int M,int N); ~IntMatParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -42,5 +42,5 @@ Object* copy(); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ 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));} Index: /issm/trunk-jpl/src/c/objects/Params/IntParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/IntParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*IntParam constructors and destructor*/ -/*FUNCTION IntParam::IntParam(){{{1*/ +/*FUNCTION IntParam::IntParam(){{{*/ IntParam::IntParam(){ return; } /*}}}*/ -/*FUNCTION IntParam::IntParam(int enum_type,IssmInt value){{{1*/ +/*FUNCTION IntParam::IntParam(int enum_type,IssmInt value){{{*/ IntParam::IntParam(int in_enum_type,IssmInt in_value){ @@ -33,5 +33,5 @@ } /*}}}*/ -/*FUNCTION IntParam::~IntParam(){{{1*/ +/*FUNCTION IntParam::~IntParam(){{{*/ IntParam::~IntParam(){ return; @@ -40,10 +40,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION IntParam::Echo {{{1*/ +/*FUNCTION IntParam::Echo {{{*/ void IntParam::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION IntParam::DeepEcho{{{1*/ +/*FUNCTION IntParam::DeepEcho{{{*/ void IntParam::DeepEcho(void){ @@ -53,8 +53,8 @@ } /*}}}*/ -/*FUNCTION IntParam::Id{{{1*/ +/*FUNCTION IntParam::Id{{{*/ int IntParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION IntParam::MyRank{{{1*/ +/*FUNCTION IntParam::MyRank{{{*/ int IntParam::MyRank(void){ extern int my_rank; @@ -62,5 +62,5 @@ } /*}}}*/ -/*FUNCTION IntParam::ObjectEnum{{{1*/ +/*FUNCTION IntParam::ObjectEnum{{{*/ int IntParam::ObjectEnum(void){ @@ -69,5 +69,5 @@ } /*}}}*/ -/*FUNCTION IntParam::copy{{{1*/ +/*FUNCTION IntParam::copy{{{*/ Object* IntParam::copy() { @@ -78,10 +78,10 @@ /*IntParam virtual functions definitions: */ -/*FUNCTION IntParam::GetParameterName{{{1*/ +/*FUNCTION IntParam::GetParameterName{{{*/ void IntParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION IntParam::UnitConversion{{{1*/ +/*FUNCTION IntParam::UnitConversion{{{*/ void IntParam::UnitConversion(int direction_enum){ /*do nothing, no unit conversion*/ Index: /issm/trunk-jpl/src/c/objects/Params/IntParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/IntParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -28,10 +28,10 @@ public: - /*IntParam constructors, destructors: {{{1*/ + /*IntParam constructors, destructors: {{{*/ IntParam(); IntParam(int enum_type,IssmInt value); ~IntParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -41,5 +41,5 @@ Object* copy(); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ 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));} Index: /issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/IntVecParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*IntVecParam constructors and destructor*/ -/*FUNCTION IntVecParam::IntVecParam(){{{1*/ +/*FUNCTION IntVecParam::IntVecParam(){{{*/ IntVecParam::IntVecParam(){ return; } /*}}}*/ -/*FUNCTION IntVecParam::IntVecParam(int enum_type,int* values,int M){{{1*/ +/*FUNCTION IntVecParam::IntVecParam(int enum_type,int* values,int M){{{*/ IntVecParam::IntVecParam(int in_enum_type,int* in_values, int in_M){ @@ -39,5 +39,5 @@ } /*}}}*/ -/*FUNCTION IntVecParam::IntVecParam(int enum_type,double* values,int M){{{1*/ +/*FUNCTION IntVecParam::IntVecParam(int enum_type,double* values,int M){{{*/ IntVecParam::IntVecParam(int in_enum_type,double* in_values, int in_M){ @@ -52,5 +52,5 @@ } /*}}}*/ -/*FUNCTION IntVecParam::~IntVecParam(){{{1*/ +/*FUNCTION IntVecParam::~IntVecParam(){{{*/ IntVecParam::~IntVecParam(){ xfree((void**)&values); @@ -60,5 +60,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION IntVecParam::Echo {{{1*/ +/*FUNCTION IntVecParam::Echo {{{*/ void IntVecParam::Echo(void){ @@ -69,5 +69,5 @@ } /*}}}*/ -/*FUNCTION IntVecParam::DeepEcho{{{1*/ +/*FUNCTION IntVecParam::DeepEcho{{{*/ void IntVecParam::DeepEcho(void){ @@ -82,8 +82,8 @@ } /*}}}*/ -/*FUNCTION IntVecParam::Id{{{1*/ +/*FUNCTION IntVecParam::Id{{{*/ int IntVecParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION IntVecParam::MyRank{{{1*/ +/*FUNCTION IntVecParam::MyRank{{{*/ int IntVecParam::MyRank(void){ extern int my_rank; @@ -91,5 +91,5 @@ } /*}}}*/ -/*FUNCTION IntVecParam::ObjectEnum{{{1*/ +/*FUNCTION IntVecParam::ObjectEnum{{{*/ int IntVecParam::ObjectEnum(void){ @@ -98,5 +98,5 @@ } /*}}}*/ -/*FUNCTION IntVecParam::copy{{{1*/ +/*FUNCTION IntVecParam::copy{{{*/ Object* IntVecParam::copy() { @@ -107,5 +107,5 @@ /*IntVecParam virtual functions definitions: */ -/*FUNCTION IntVecParam::GetParameterValue{{{1*/ +/*FUNCTION IntVecParam::GetParameterValue{{{*/ void IntVecParam::GetParameterValue(int** pintarray,int* pM){ int* output=NULL; @@ -121,10 +121,10 @@ } /*}}}*/ -/*FUNCTION IntVecParam::GetParameterName{{{1*/ +/*FUNCTION IntVecParam::GetParameterName{{{*/ void IntVecParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION IntVecParam::SetValue{{{1*/ +/*FUNCTION IntVecParam::SetValue{{{*/ void IntVecParam::SetValue(int* intarray,int in_M){ @@ -141,5 +141,5 @@ } /*}}}*/ -/*FUNCTION IntVecParam::UnitConversion{{{1*/ +/*FUNCTION IntVecParam::UnitConversion{{{*/ void IntVecParam::UnitConversion(int direction_enum){ /*do nothing, no unit conversion*/ Index: /issm/trunk-jpl/src/c/objects/Params/IntVecParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/IntVecParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/IntVecParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -28,5 +28,5 @@ public: - /*IntVecParam constructors, destructors: {{{1*/ + /*IntVecParam constructors, destructors: {{{*/ IntVecParam(); IntVecParam(int enum_type,int* values,int M); @@ -34,5 +34,5 @@ ~IntVecParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -42,5 +42,5 @@ Object* copy(); /*}}}*/ - /*Param virtual functions definitions: {{{1*/ + /*Param virtual functions definitions: {{{*/ 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));} Index: /issm/trunk-jpl/src/c/objects/Params/MatrixParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/MatrixParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/MatrixParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*MatrixParam constructors and destructor*/ -/*FUNCTION MatrixParam::MatrixParam(){{{1*/ +/*FUNCTION MatrixParam::MatrixParam(){{{*/ MatrixParam::MatrixParam(){ return; } /*}}}*/ -/*FUNCTION MatrixParam::MatrixParam(int enum_type,Matrix* value){{{1*/ +/*FUNCTION MatrixParam::MatrixParam(int enum_type,Matrix* value){{{*/ MatrixParam::MatrixParam(int in_enum_type,Matrix* in_value){ @@ -37,5 +37,5 @@ } /*}}}*/ -/*FUNCTION MatrixParam::~MatrixParam(){{{1*/ +/*FUNCTION MatrixParam::~MatrixParam(){{{*/ MatrixParam::~MatrixParam(){ xdelete(&value); @@ -44,5 +44,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION MatrixParam::Echo {{{1*/ +/*FUNCTION MatrixParam::Echo {{{*/ void MatrixParam::Echo(void){ @@ -52,5 +52,5 @@ } /*}}}*/ -/*FUNCTION MatrixParam::DeepEcho{{{1*/ +/*FUNCTION MatrixParam::DeepEcho{{{*/ void MatrixParam::DeepEcho(void){ @@ -61,8 +61,8 @@ } /*}}}*/ -/*FUNCTION MatrixParam::Id{{{1*/ +/*FUNCTION MatrixParam::Id{{{*/ int MatrixParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION MatrixParam::MyRank{{{1*/ +/*FUNCTION MatrixParam::MyRank{{{*/ int MatrixParam::MyRank(void){ extern int my_rank; @@ -70,5 +70,5 @@ } /*}}}*/ -/*FUNCTION MatrixParam::ObjectEnum{{{1*/ +/*FUNCTION MatrixParam::ObjectEnum{{{*/ int MatrixParam::ObjectEnum(void){ @@ -77,5 +77,5 @@ } /*}}}*/ -/*FUNCTION MatrixParam::copy{{{1*/ +/*FUNCTION MatrixParam::copy{{{*/ Object* MatrixParam::copy() { @@ -86,5 +86,5 @@ /*MatrixParam virtual functions definitions: */ -/*FUNCTION MatrixParam::GetParameterValue{{{1*/ +/*FUNCTION MatrixParam::GetParameterValue{{{*/ void MatrixParam::GetParameterValue(Matrix** poutput){ Matrix* output=NULL; @@ -96,10 +96,10 @@ } /*}}}*/ -/*FUNCTION MatrixParam::GetParameterName{{{1*/ +/*FUNCTION MatrixParam::GetParameterName{{{*/ void MatrixParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION MatrixParam::SetValue{{{1*/ +/*FUNCTION MatrixParam::SetValue{{{*/ void MatrixParam::SetValue(Matrix* matrix){ @@ -111,5 +111,5 @@ } /*}}}*/ -/*FUNCTION MatrixParam::UnitConversion{{{1*/ +/*FUNCTION MatrixParam::UnitConversion{{{*/ void MatrixParam::UnitConversion(int direction_enum){ /*do nothing, no unit conversion*/ Index: /issm/trunk-jpl/src/c/objects/Params/MatrixParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/MatrixParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/MatrixParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -28,10 +28,10 @@ public: - /*MatrixParam constructors, destructors: {{{1*/ + /*MatrixParam constructors, destructors: {{{*/ MatrixParam(); MatrixParam(int enum_type,Matrix* value); ~MatrixParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -41,5 +41,5 @@ Object* copy(); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("Matrix param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk-jpl/src/c/objects/Params/Param.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/Param.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/Param.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H Index: /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*StringArrayParam constructors and destructor*/ -/*FUNCTION StringArrayParam::StringArrayParam(){{{1*/ +/*FUNCTION StringArrayParam::StringArrayParam(){{{*/ StringArrayParam::StringArrayParam(){ return; } /*}}}*/ -/*FUNCTION StringArrayParam::StringArrayParam(int enum_type,char** in_values,int in_numstrings){{{1*/ +/*FUNCTION StringArrayParam::StringArrayParam(int enum_type,char** in_values,int in_numstrings){{{*/ StringArrayParam::StringArrayParam(int in_enum_type,char** in_values, int in_numstrings){ @@ -49,5 +49,5 @@ } /*}}}*/ -/*FUNCTION StringArrayParam::~StringArrayParam(){{{1*/ +/*FUNCTION StringArrayParam::~StringArrayParam(){{{*/ StringArrayParam::~StringArrayParam(){ @@ -64,10 +64,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION StringArrayParam::Echo {{{1*/ +/*FUNCTION StringArrayParam::Echo {{{*/ void StringArrayParam::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION StringArrayParam::DeepEcho{{{1*/ +/*FUNCTION StringArrayParam::DeepEcho{{{*/ void StringArrayParam::DeepEcho(void){ @@ -83,8 +83,8 @@ } /*}}}*/ -/*FUNCTION StringArrayParam::Id{{{1*/ +/*FUNCTION StringArrayParam::Id{{{*/ int StringArrayParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION StringArrayParam::MyRank{{{1*/ +/*FUNCTION StringArrayParam::MyRank{{{*/ int StringArrayParam::MyRank(void){ extern int my_rank; @@ -92,5 +92,5 @@ } /*}}}*/ -/*FUNCTION StringArrayParam::ObjectEnum{{{1*/ +/*FUNCTION StringArrayParam::ObjectEnum{{{*/ int StringArrayParam::ObjectEnum(void){ @@ -99,5 +99,5 @@ } /*}}}*/ -/*FUNCTION StringArrayParam::copy{{{1*/ +/*FUNCTION StringArrayParam::copy{{{*/ Object* StringArrayParam::copy() { @@ -108,5 +108,5 @@ /*StringArrayParam virtual functions definitions: */ -/*FUNCTION StringArrayParam::GetParameterValue{{{1*/ +/*FUNCTION StringArrayParam::GetParameterValue{{{*/ void StringArrayParam::GetParameterValue(char*** pstringarray,int* pM){ @@ -139,10 +139,10 @@ } /*}}}*/ -/*FUNCTION StringArrayParam::GetParameterName{{{1*/ +/*FUNCTION StringArrayParam::GetParameterName{{{*/ void StringArrayParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION StringArrayParam::SetValue{{{1*/ +/*FUNCTION StringArrayParam::SetValue{{{*/ void StringArrayParam::SetValue(char** stringarray,int M){ @@ -173,5 +173,5 @@ } /*}}}*/ -/*FUNCTION StringArrayParam::UnitConversion{{{1*/ +/*FUNCTION StringArrayParam::UnitConversion{{{*/ void StringArrayParam::UnitConversion(int direction_enum){ /*do nothing, no unit conversion*/ Index: /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/StringArrayParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -30,10 +30,10 @@ public: - /*StringArrayParam constructors, destructors: {{{1*/ + /*StringArrayParam constructors, destructors: {{{*/ StringArrayParam(); StringArrayParam(int enum_type,char** values, int numstrings); ~StringArrayParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -43,5 +43,5 @@ Object* copy(); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ 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));} Index: /issm/trunk-jpl/src/c/objects/Params/StringParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/StringParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/StringParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*StringParam constructors and destructor*/ -/*FUNCTION StringParam::StringParam(){{{1*/ +/*FUNCTION StringParam::StringParam(){{{*/ StringParam::StringParam(){ return; } /*}}}*/ -/*FUNCTION StringParam::StringParam(int enum_type,IssmString value){{{1*/ +/*FUNCTION StringParam::StringParam(int enum_type,IssmString value){{{*/ StringParam::StringParam(int in_enum_type,char* in_value){ @@ -36,5 +36,5 @@ } /*}}}*/ -/*FUNCTION StringParam::~StringParam(){{{1*/ +/*FUNCTION StringParam::~StringParam(){{{*/ StringParam::~StringParam(){ xfree((void**)&value); @@ -43,10 +43,10 @@ /*Object virtual functions definitions:*/ -/*FUNCTION StringParam::Echo {{{1*/ +/*FUNCTION StringParam::Echo {{{*/ void StringParam::Echo(void){ this->DeepEcho(); } /*}}}*/ -/*FUNCTION StringParam::DeepEcho{{{1*/ +/*FUNCTION StringParam::DeepEcho{{{*/ void StringParam::DeepEcho(void){ printf("StringParam:\n"); @@ -55,8 +55,8 @@ } /*}}}*/ -/*FUNCTION StringParam::Id{{{1*/ +/*FUNCTION StringParam::Id{{{*/ int StringParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION StringParam::MyRank{{{1*/ +/*FUNCTION StringParam::MyRank{{{*/ int StringParam::MyRank(void){ extern int my_rank; @@ -64,5 +64,5 @@ } /*}}}*/ -/*FUNCTION StringParam::ObjectEnum{{{1*/ +/*FUNCTION StringParam::ObjectEnum{{{*/ int StringParam::ObjectEnum(void){ @@ -71,5 +71,5 @@ } /*}}}*/ -/*FUNCTION StringParam::copy{{{1*/ +/*FUNCTION StringParam::copy{{{*/ Object* StringParam::copy() { @@ -80,5 +80,5 @@ /*StringParam virtual functions definitions: */ -/*FUNCTION StringParam::GetParameterValue{{{1*/ +/*FUNCTION StringParam::GetParameterValue{{{*/ void StringParam::GetParameterValue(char** pstring){ @@ -95,10 +95,10 @@ } /*}}}*/ -/*FUNCTION StringParam::GetParameterName{{{1*/ +/*FUNCTION StringParam::GetParameterName{{{*/ void StringParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION StringParam::SetValue{{{1*/ +/*FUNCTION StringParam::SetValue{{{*/ void StringParam::SetValue(char* string){ @@ -115,5 +115,5 @@ } /*}}}*/ -/*FUNCTION StringParam::UnitConversion{{{1*/ +/*FUNCTION StringParam::UnitConversion{{{*/ void StringParam::UnitConversion(int direction_enum){ /*do nothing, no unit conversion*/ Index: /issm/trunk-jpl/src/c/objects/Params/StringParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/StringParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/StringParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -28,10 +28,10 @@ public: - /*StringParam constructors, destructors: {{{1*/ + /*StringParam constructors, destructors: {{{*/ StringParam(); StringParam(int enum_type,char* value); ~StringParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -41,5 +41,5 @@ Object* copy(); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ 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));} Index: /issm/trunk-jpl/src/c/objects/Params/VectorParam.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/VectorParam.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/VectorParam.cpp (revision 12365) @@ -4,5 +4,5 @@ /*header files: */ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -21,10 +21,10 @@ /*VectorParam constructors and destructor*/ -/*FUNCTION VectorParam::VectorParam(){{{1*/ +/*FUNCTION VectorParam::VectorParam(){{{*/ VectorParam::VectorParam(){ return; } /*}}}*/ -/*FUNCTION VectorParam::VectorParam(int enum_type,IssmVector value){{{1*/ +/*FUNCTION VectorParam::VectorParam(int enum_type,IssmVector value){{{*/ VectorParam::VectorParam(int in_enum_type,Vector* in_value){ @@ -39,5 +39,5 @@ } /*}}}*/ -/*FUNCTION VectorParam::~VectorParam(){{{1*/ +/*FUNCTION VectorParam::~VectorParam(){{{*/ VectorParam::~VectorParam(){ xdelete(&value); @@ -46,5 +46,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION VectorParam::Echo {{{1*/ +/*FUNCTION VectorParam::Echo {{{*/ void VectorParam::Echo(void){ @@ -54,5 +54,5 @@ } /*}}}*/ -/*FUNCTION VectorParam::DeepEcho{{{1*/ +/*FUNCTION VectorParam::DeepEcho{{{*/ void VectorParam::DeepEcho(void){ @@ -63,8 +63,8 @@ } /*}}}*/ -/*FUNCTION VectorParam::Id{{{1*/ +/*FUNCTION VectorParam::Id{{{*/ int VectorParam::Id(void){ return -1; } /*}}}*/ -/*FUNCTION VectorParam::MyRank{{{1*/ +/*FUNCTION VectorParam::MyRank{{{*/ int VectorParam::MyRank(void){ extern int my_rank; @@ -72,5 +72,5 @@ } /*}}}*/ -/*FUNCTION VectorParam::ObjectEnum{{{1*/ +/*FUNCTION VectorParam::ObjectEnum{{{*/ int VectorParam::ObjectEnum(void){ @@ -79,5 +79,5 @@ } /*}}}*/ -/*FUNCTION VectorParam::copy{{{1*/ +/*FUNCTION VectorParam::copy{{{*/ Object* VectorParam::copy() { @@ -88,5 +88,5 @@ /*VectorParam virtual functions definitions: */ -/*FUNCTION VectorParam::GetParameterValue{{{1*/ +/*FUNCTION VectorParam::GetParameterValue{{{*/ void VectorParam::GetParameterValue(Vector** poutput){ Vector* output=NULL; @@ -99,10 +99,10 @@ } /*}}}*/ -/*FUNCTION VectorParam::GetParameterName{{{1*/ +/*FUNCTION VectorParam::GetParameterName{{{*/ void VectorParam::GetParameterName(char**pname){ EnumToStringx(pname,this->enum_type); } /*}}}*/ -/*FUNCTION VectorParam::SetValue{{{1*/ +/*FUNCTION VectorParam::SetValue{{{*/ void VectorParam::SetValue(Vector* vector){ @@ -115,5 +115,5 @@ } /*}}}*/ -/*FUNCTION VectorParam::UnitConversion{{{1*/ +/*FUNCTION VectorParam::UnitConversion{{{*/ void VectorParam::UnitConversion(int direction_enum){ /*do nothing, no unit conversion*/ Index: /issm/trunk-jpl/src/c/objects/Params/VectorParam.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Params/VectorParam.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Params/VectorParam.h (revision 12365) @@ -8,5 +8,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -28,10 +28,10 @@ public: - /*VectorParam constructors, destructors: {{{1*/ + /*VectorParam constructors, destructors: {{{*/ VectorParam(); VectorParam(int enum_type,Vector* value); ~VectorParam(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -41,5 +41,5 @@ Object* copy(); /*}}}*/ - /*Param vritual function definitions: {{{1*/ + /*Param vritual function definitions: {{{*/ int InstanceEnum(){return enum_type;} void GetParameterValue(bool* pbool){_error_("Vector param of enum %i (%s) cannot return a bool",enum_type,EnumToStringx(enum_type));} Index: /issm/trunk-jpl/src/c/objects/Patch.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Patch.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Patch.cpp (revision 12365) @@ -3,5 +3,5 @@ */ -/*Include files: {{{1*/ +/*Include files: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -22,5 +22,5 @@ /*Object constructors and destructors:*/ -/*FUNCTION Patch::Patch() default constructor {{{1*/ +/*FUNCTION Patch::Patch() default constructor {{{*/ Patch::Patch(){ this->numrows=0; @@ -31,5 +31,5 @@ } /*}}}*/ -/*FUNCTION Patch::Patch(int numrows, int maxvertices, int maxnodes){{{1*/ +/*FUNCTION Patch::Patch(int numrows, int maxvertices, int maxnodes){{{*/ Patch::Patch(int in_numrows, int in_maxvertices, int in_maxnodes){ @@ -62,5 +62,5 @@ } /*}}}*/ -/*FUNCTION Patch::~Patch(){{{1*/ +/*FUNCTION Patch::~Patch(){{{*/ Patch::~Patch(){ xfree((void**)&values); @@ -69,5 +69,5 @@ /*Object methods*/ -/*FUNCTION Patch::fillelementinfo{{{1*/ +/*FUNCTION Patch::fillelementinfo{{{*/ void Patch::fillelementinfo(int count, int element_id, int* vertices_ids, int num_vertices){ @@ -88,5 +88,5 @@ } /*}}}*/ -/*FUNCTION Patch::fillresultinfo{{{1*/ +/*FUNCTION Patch::fillresultinfo{{{*/ void Patch::fillresultinfo(int count,int enum_type,int step, double time, int interpolation, double* nodal_values, int num_nodes){ @@ -110,5 +110,5 @@ } /*}}}*/ -/*FUNCTION Patch::Gather{{{1*/ +/*FUNCTION Patch::Gather{{{*/ void Patch::Gather(void){ Index: /issm/trunk-jpl/src/c/objects/Segment.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Segment.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Segment.cpp (revision 12365) @@ -3,5 +3,5 @@ */ -/*Include files: {{{1*/ +/*Include files: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -20,5 +20,5 @@ /*Segment constructors and destructors:*/ -/*FUNCTION Segment::Segment() default constructor {{{1*/ +/*FUNCTION Segment::Segment() default constructor {{{*/ Segment::Segment(){ this->eid=UNDEF; @@ -29,5 +29,5 @@ } /*}}}*/ -/*FUNCTION Segment::Segment(int eid, IssmDouble x1,IssmDouble y1,IssmDouble x2, IssmDouble y2){{{1*/ +/*FUNCTION Segment::Segment(int eid, IssmDouble x1,IssmDouble y1,IssmDouble x2, IssmDouble y2){{{*/ Segment::Segment(int segment_eid, IssmDouble segment_x1,IssmDouble segment_y1,IssmDouble segment_x2, IssmDouble segment_y2){ @@ -40,5 +40,5 @@ } /*}}}*/ -/*FUNCTION Segment::~Segment(){{{1*/ +/*FUNCTION Segment::~Segment(){{{*/ Segment::~Segment(){ } @@ -46,5 +46,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION Segment::Echo{{{1*/ +/*FUNCTION Segment::Echo{{{*/ void Segment::Echo(void){ @@ -56,13 +56,13 @@ } /*}}}*/ -/*FUNCTION Segment::DeepEcho{{{1*/ +/*FUNCTION Segment::DeepEcho{{{*/ void Segment::DeepEcho(void){ this->Echo(); } /*}}}*/ -/*FUNCTION Segment::Id{{{1*/ +/*FUNCTION Segment::Id{{{*/ int Segment::Id(void){ return eid; } /*}}}*/ -/*FUNCTION Segment::MyRank{{{1*/ +/*FUNCTION Segment::MyRank{{{*/ int Segment::MyRank(void){ extern int my_rank; @@ -71,5 +71,5 @@ } /*}}}*/ -/*FUNCTION Segment::ObjectEnum{{{1*/ +/*FUNCTION Segment::ObjectEnum{{{*/ int Segment::ObjectEnum(void){ @@ -78,5 +78,5 @@ } /*}}}*/ -/*FUNCTION Segment::copy {{{1*/ +/*FUNCTION Segment::copy {{{*/ Object* Segment::copy() { return new Segment(this->eid,this->x1,this->y1,this->x2,this->y2); Index: /issm/trunk-jpl/src/c/objects/Segment.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Segment.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Segment.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Object.h" /*}}}*/ @@ -20,10 +20,10 @@ IssmDouble y2; - /*Segment constructors, destructors {{{1*/ + /*Segment constructors, destructors {{{*/ Segment(); Segment(int eid,IssmDouble x1,IssmDouble y1, IssmDouble x2, IssmDouble y2); ~Segment(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); Index: /issm/trunk-jpl/src/c/objects/Update.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Update.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Update.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "../shared/shared.h" /*}}}*/ Index: /issm/trunk-jpl/src/c/objects/Vertex.cpp =================================================================== --- /issm/trunk-jpl/src/c/objects/Vertex.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Vertex.cpp (revision 12365) @@ -3,5 +3,5 @@ */ -/*Include files: {{{1*/ +/*Include files: {{{*/ #ifdef HAVE_CONFIG_H #include @@ -18,15 +18,15 @@ /*Vertex constructors and destructor:*/ -/*FUNCTION Vertex::Vertex() {{{1*/ +/*FUNCTION Vertex::Vertex() {{{*/ Vertex::Vertex(){ return; } /*}}}*/ -/*FUNCTION Vertex::Vertex(int vertex_id, IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma){{{1*/ +/*FUNCTION Vertex::Vertex(int vertex_id, IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma){{{*/ Vertex::Vertex(int vertex_id, int vertex_sid,IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma,int vertex_connectivity){ this->Init(vertex_id, vertex_sid,vertex_x, vertex_y, vertex_z, vertex_sigma,vertex_connectivity); } /*}}}*/ -/*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{1*/ +/*FUNCTION Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel) {{{*/ Vertex::Vertex(int vertex_id, int vertex_sid,int i, IoModel* iomodel){ @@ -38,10 +38,10 @@ } /*}}}*/ -/*FUNCTION Vertex::~Vertex() {{{1*/ +/*FUNCTION Vertex::~Vertex() {{{*/ Vertex::~Vertex(){ return; } /*}}}*/ -/*FUNCTION Vertex::Init{{{1*/ +/*FUNCTION Vertex::Init{{{*/ void Vertex::Init(int vertex_id, int vertex_sid,IssmDouble vertex_x, IssmDouble vertex_y, IssmDouble vertex_z, IssmDouble vertex_sigma,int vertex_connectivity){ @@ -61,5 +61,5 @@ /*Object virtual functions definitions:*/ -/*FUNCTION Vertex::Echo{{{1*/ +/*FUNCTION Vertex::Echo{{{*/ void Vertex::Echo(void){ @@ -78,13 +78,13 @@ } /*}}}*/ -/*FUNCTION Vertex::DeepEcho{{{1*/ +/*FUNCTION Vertex::DeepEcho{{{*/ void Vertex::DeepEcho(void){ this->Echo(); } /*}}}*/ -/*FUNCTION Vertex::Id{{{1*/ +/*FUNCTION Vertex::Id{{{*/ int Vertex::Id(void){ return id; } /*}}}*/ -/*FUNCTION Vertex::MyRank {{{1*/ +/*FUNCTION Vertex::MyRank {{{*/ int Vertex::MyRank(void){ extern int my_rank; @@ -92,5 +92,5 @@ } /*}}}*/ -/*FUNCTION Vertex::ObjectEnum{{{1*/ +/*FUNCTION Vertex::ObjectEnum{{{*/ int Vertex::ObjectEnum(void){ @@ -99,5 +99,5 @@ } /*}}}*/ -/*FUNCTION Vertex::copy {{{1*/ +/*FUNCTION Vertex::copy {{{*/ Object* Vertex::copy() { @@ -108,5 +108,5 @@ /* DofObject routines: */ -/*FUNCTION Vertex::DistributeDofs{{{1*/ +/*FUNCTION Vertex::DistributeDofs{{{*/ void Vertex::DistributeDofs(int* pdofcount){ @@ -131,5 +131,5 @@ } /*}}}*/ -/*FUNCTION Vertex::OffsetDofs{{{1*/ +/*FUNCTION Vertex::OffsetDofs{{{*/ void Vertex::OffsetDofs(int dofcount){ @@ -146,5 +146,5 @@ } /*}}}*/ -/*FUNCTION Vertex::ShowTrueDofs{{{1*/ +/*FUNCTION Vertex::ShowTrueDofs{{{*/ void Vertex::ShowTrueDofs(int* truedofs){ @@ -160,5 +160,5 @@ } /*}}}*/ -/*FUNCTION Vertex::UpdateCloneDofs{{{1*/ +/*FUNCTION Vertex::UpdateCloneDofs{{{*/ void Vertex::UpdateCloneDofs(int* alltruedofs){ @@ -174,5 +174,5 @@ } /*}}}*/ -/*FUNCTION Vertex::SetClone {{{1*/ +/*FUNCTION Vertex::SetClone {{{*/ void Vertex::SetClone(int* minranks){ @@ -192,11 +192,11 @@ /*Vertex management: */ -/*FUNCTION Vertex::Connectivity{{{1*/ +/*FUNCTION Vertex::Connectivity{{{*/ int Vertex::Connectivity(void){return connectivity;} /*}}}*/ -/*FUNCTION Vertex::Sid{{{1*/ +/*FUNCTION Vertex::Sid{{{*/ int Vertex::Sid(void){ return sid; } /*}}}*/ -/*FUNCTION Vertex::UpdateVertexPosition {{{1*/ +/*FUNCTION Vertex::UpdateVertexPosition {{{*/ void Vertex::UpdatePosition(Vector* vz,Parameters* parameters,IssmDouble* thickness,IssmDouble* bed){ Index: /issm/trunk-jpl/src/c/objects/Vertex.h =================================================================== --- /issm/trunk-jpl/src/c/objects/Vertex.h (revision 12364) +++ /issm/trunk-jpl/src/c/objects/Vertex.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #include "./Object.h" class IoModel; @@ -35,5 +35,5 @@ int dof; //dof to recover values in a vertex indexed vector - /*Vertex constructors, destructors {{{1*/ + /*Vertex constructors, destructors {{{*/ Vertex(); Vertex(int id, int sid,IssmDouble x, IssmDouble y, IssmDouble z, IssmDouble sigma, int connectivity); @@ -42,5 +42,5 @@ ~Vertex(); /*}}}*/ - /*Object virtual functions definitions:{{{1 */ + /*Object virtual functions definitions:{{{ */ void Echo(); void DeepEcho(); @@ -50,5 +50,5 @@ Object* copy(); /*}}}*/ - /*DofObject routines {{{1*/ + /*DofObject routines {{{*/ void DistributeDofs(int* pdofcount); void OffsetDofs(int dofcount); @@ -57,5 +57,5 @@ void SetClone(int* minranks); /*}}}*/ - /*Vertex management: {{{1*/ + /*Vertex management: {{{*/ int Sid(void); int Connectivity(void); Index: /issm/trunk-jpl/src/c/python/include/python_macros.h =================================================================== --- /issm/trunk-jpl/src/c/python/include/python_macros.h (revision 12364) +++ /issm/trunk-jpl/src/c/python/include/python_macros.h (revision 12365) @@ -6,5 +6,5 @@ #define _PYTHON_MACROS_H_ -/*Header {{{1*/ +/*Header {{{*/ #ifdef HAVE_CONFIG_H @@ -16,5 +16,5 @@ #ifdef _HAVE_PYTHON_ -/* MODULEBOOT/MODULEEND {{{1*/ +/* MODULEBOOT/MODULEEND {{{*/ /*The following macros hide the error exception handling in a matlab module. Just put @@ -30,5 +30,5 @@ //}}} #if _PYTHON_MAJOR_ >=3 -/* WRAPPER 3.2 {{{1*/ +/* WRAPPER 3.2 {{{*/ #define WRAPPER(modulename,...) \ \ @@ -57,5 +57,5 @@ /*}}}*/ #else -/* WRAPPER 2.7 {{{1*/ +/* WRAPPER 2.7 {{{*/ #define WRAPPER(modulename,...) \ \ @@ -75,5 +75,5 @@ /*}}}*/ #endif -/* CHECKARGUMENTS {{{1*/ +/* CHECKARGUMENTS {{{*/ #define CHECKARGUMENTS(NLHS,NRHS,functionpointer) CheckNumPythonArguments(args, NRHS,functionpointer) /*}}}*/ Index: /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp =================================================================== --- /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp (revision 12365) @@ -17,5 +17,5 @@ /*Primitive data types*/ -/*FUNCTION FetchData(double* pscalar,PyObject* py_float){{{1*/ +/*FUNCTION FetchData(double* pscalar,PyObject* py_float){{{*/ void FetchData(double* pscalar,PyObject* py_float){ @@ -29,5 +29,5 @@ } /*}}}*/ -/*FUNCTION FetchData(int* pinteger,PyObject* py_long){{{1*/ +/*FUNCTION FetchData(int* pinteger,PyObject* py_long){{{*/ void FetchData(int* pinteger, PyObject* py_long){ @@ -41,5 +41,5 @@ } /*}}}*/ -/*FUNCTION FetchData(bool* pboolean,PyObject* py_boolean){{{1*/ +/*FUNCTION FetchData(bool* pboolean,PyObject* py_boolean){{{*/ void FetchData(bool* pboolean,PyObject* py_boolean){ @@ -57,5 +57,5 @@ } /*}}}*/ -/*FUNCTION FetchData(double** pmatrix,int* pM, int* pN, PyObject* py_matrix){{{1*/ +/*FUNCTION FetchData(double** pmatrix,int* pM, int* pN, PyObject* py_matrix){{{*/ void FetchData(double** pmatrix,int* pM,int *pN,PyObject* py_matrix){ @@ -81,5 +81,5 @@ } /*}}}*/ -/*FUNCTION FetchData(double** pvector,int* pM, PyObject* py_vector){{{1*/ +/*FUNCTION FetchData(double** pvector,int* pM, PyObject* py_vector){{{*/ void FetchData(double** pvector,int* pM,PyObject* py_vector){ @@ -107,5 +107,5 @@ /*Python version dependent: */ #if _PYTHON_MAJOR_ >= 3 -/*FUNCTION FetchData(char** pstring,PyObject* py_unicode){{{1*/ +/*FUNCTION FetchData(char** pstring,PyObject* py_unicode){{{*/ void FetchData(char** pstring,PyObject* py_unicode){ @@ -124,5 +124,5 @@ /*}}}*/ #else -/*FUNCTION FetchData(char** pstring,PyObject* py_string){{{1*/ +/*FUNCTION FetchData(char** pstring,PyObject* py_string){{{*/ void FetchData(char** pstring,PyObject* py_string){ Index: /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp =================================================================== --- /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/python/io/WritePythonData.cpp (revision 12365) @@ -21,12 +21,11 @@ -/*FUNCTION WriteData(PyObject* py_tuple,int index,char* string){{{1*/ +/*FUNCTION WriteData(PyObject* py_tuple,int index,char* string){{{*/ void WriteData(PyObject* py_tuple, int index, char* string){ PyTuple_SetItem(py_tuple, index, PyUnicode_FromString(string)); -} -/*}}}*/ -/*FUNCTION WriteData(PyObject* tuple,int index,Matrix* matrix){{{1*/ +}/*}}}*/ +/*FUNCTION WriteData(PyObject* tuple,int index,Matrix* matrix){{{*/ void WriteData(PyObject* tuple,int index,Matrix* matrix){ @@ -45,6 +44,6 @@ -} -/*FUNCTION WriteData(PyObject* py_tuple,int index,Vector* vector){{{1*/ +}/*}}}*/ +/*FUNCTION WriteData(PyObject* py_tuple,int index,Vector* vector){{{*/ void WriteData(PyObject* tuple,int index,Vector* vector){ @@ -64,5 +63,5 @@ } /*}}}*/ -/*FUNCTION WriteData(PyObject* py_tuple,int index, double* matrix, int M, int N){{{1*/ +/*FUNCTION WriteData(PyObject* py_tuple,int index, double* matrix, int M, int N){{{*/ void WriteData(PyObject* tuple, int index, double* matrix, int M,int N){ @@ -76,3 +75,3 @@ PyTuple_SetItem(tuple, index, array); -} +}/*}}}*/ Index: /issm/trunk-jpl/src/c/shared/Exp/IsInPoly.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Exp/IsInPoly.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/shared/Exp/IsInPoly.cpp (revision 12365) @@ -14,5 +14,5 @@ #endif -/*IsInPoly {{{1*/ +/*IsInPoly {{{*/ int IsInPoly(Vector* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue){ @@ -55,5 +55,5 @@ return 1; }/*}}}*/ -/*IsOutsidePoly {{{1*/ +/*IsOutsidePoly {{{*/ int IsOutsidePoly(Vector* in,double* xc,double* yc,int numvertices,double* x,double* y,int i0,int i1, int edgevalue){ @@ -96,5 +96,5 @@ return 1; }/*}}}*/ -/*pnpoly{{{1*/ +/*pnpoly{{{*/ int pnpoly(int npol, double *xp, double *yp, double x, double y, int edgevalue) { int i, j, c = 0; Index: /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers*/ -/*{{{1*/ +/*{{{*/ #include "./matrix.h" #include "../Exceptions/exceptions.h" @@ -16,5 +16,5 @@ /*}}}*/ -/*FUNCTION TripleMultiply {{{1*/ +/*FUNCTION TripleMultiply {{{*/ int TripleMultiply( double* a, int nrowa, int ncola, int itrna, double* b, int nrowb, int ncolb, int itrnb, double* c, int nrowc, int ncolc, int itrnc, double* d, int iaddd){ /*TripleMultiply Perform triple matrix product a*b*c+d.*/ @@ -98,5 +98,5 @@ return 1; }/*}}}*/ -/*FUNCTION MatrixMuliply {{{1*/ +/*FUNCTION MatrixMuliply {{{*/ int MatrixMultiply( double* a, int nrowa, int ncola, int itrna, double* b, int nrowb, int ncolb, int itrnb, double* c, int iaddc ){ /*MatrixMultiply Perform matrix multiplication a*b+c.*/ @@ -167,5 +167,5 @@ return noerr; }/*}}}*/ -/*FUNCTION MatrixInverse {{{1*/ +/*FUNCTION MatrixInverse {{{*/ int MatrixInverse( double* a, int ndim, int nrow, double* b, int nvec, double* pdet ){ /* MatrixInverse Perform matrix inversion and linear equation solution. @@ -344,5 +344,5 @@ return noerr; }/*}}}*/ -/*FUNCTION Matrix2x2Determinant(double* Adet,double* A) {{{1*/ +/*FUNCTION Matrix2x2Determinant(double* Adet,double* A) {{{*/ void Matrix2x2Determinant(double* Adet,double* A){ /*Compute determinant of a 2x2 matrix*/ @@ -352,5 +352,5 @@ } /*}}}*/ -/*FUNCTION Matrix2x2Invert(double* Ainv,double* A) {{{1*/ +/*FUNCTION Matrix2x2Invert(double* Ainv,double* A) {{{*/ void Matrix2x2Invert(double* Ainv,double* A){ @@ -369,5 +369,5 @@ }/*}}}*/ -/*FUNCTION Matrix3x3Determinant(double* Adet,double* A) {{{1*/ +/*FUNCTION Matrix3x3Determinant(double* Adet,double* A) {{{*/ void Matrix3x3Determinant(double* Adet,double* A){ /*Compute determinant of a 3x3 matrix*/ @@ -377,5 +377,5 @@ } /*}}}*/ -/*FUNCTION Matrix3x3Invert(double* Ainv,double* A) {{{1*/ +/*FUNCTION Matrix3x3Invert(double* Ainv,double* A) {{{*/ void Matrix3x3Invert(double* Ainv,double* A){ @@ -399,5 +399,5 @@ }/*}}}*/ -/*FUNCTION MatrixTranspose(double* Adet,double* A) {{{1*/ +/*FUNCTION MatrixTranspose(double* Adet,double* A) {{{*/ void MatrixTranspose(double* tA,double* A, int nrows, int ncols){ /*Transpose a n*m matrix*/ Index: /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp (revision 12365) @@ -10,5 +10,5 @@ /*General Gauss points*/ -/*FUNCTION GaussLegendreLinear {{{1*/ +/*FUNCTION GaussLegendreLinear {{{*/ void GaussLegendreLinear( double** pxgaus, double** pxwgt, int ngaus){ /* Gauss-Legendre quadrature points. @@ -87,6 +87,6 @@ xfree((void **)&alpha); } -}/*}}}1*/ -/*FUNCTION GaussLegendreTria{{{1*/ +}/*}}}*/ +/*FUNCTION GaussLegendreTria{{{*/ void GaussLegendreTria( int* pngaus, double** pl1, double** pl2, double** pl3, double** pwgt, int iord ) { /*Gauss quadrature points for the triangle. @@ -102,5 +102,5 @@ /*Hardcoded Gauss points declaration*/ - /*p= 1, npoint= 1{{{2*/ + /*p= 1, npoint= 1{{{*/ static double wgt1[]={ 1.732050807568877}; @@ -111,6 +111,6 @@ static double l31[]={ 0.333333333333333}; - /*}}}2*/ - /*p= 2, npoint= 3 {{{2*/ + /*}}}*/ + /*p= 2, npoint= 3 {{{*/ static double wgt2[]={ 0.577350269189625, 0.577350269189625, 0.577350269189625}; @@ -121,6 +121,6 @@ static double l32[]={ 0.166666666666667, 0.166666666666667, 0.666666666666667}; - /*}}}2*/ - /*p= 3, npoint= 4 {{{2*/ + /*}}}*/ + /*p= 3, npoint= 4 {{{*/ static double wgt3[]={ -0.974278579257493, 0.902109795608790, 0.902109795608790, @@ -135,6 +135,6 @@ 0.333333333333333, 0.200000000000000, 0.200000000000000, 0.600000000000000}; - /*}}}2*/ - /*p= 4, npoint= 6 {{{2*/ + /*}}}*/ + /*p= 4, npoint= 6 {{{*/ static double wgt4[]={ 0.386908262797819, 0.386908262797819, 0.386908262797819, @@ -149,6 +149,6 @@ 0.445948490915965, 0.445948490915965, 0.108103018168070, 0.091576213509771, 0.091576213509771, 0.816847572980459}; - /*}}}2*/ - /*p= 5, npoint= 7 {{{2*/ + /*}}}*/ + /*p= 5, npoint= 7 {{{*/ static double wgt5[]={ 0.389711431702997, 0.229313399254729, 0.229313399254729, @@ -167,6 +167,6 @@ 0.059715871789770, 0.101286507323456, 0.101286507323456, 0.797426985353087}; - /*}}}2*/ - /*p= 6, npoint=12 {{{2*/ + /*}}}*/ + /*p= 6, npoint=12 {{{*/ static double wgt6[]={ 0.202279763184836, 0.202279763184836, 0.202279763184836, @@ -189,6 +189,6 @@ 0.636502499121399, 0.310352451033784, 0.636502499121399, 0.310352451033784, 0.053145049844817, 0.053145049844817}; - /*}}}2*/ - /*p= 7, npoint=13 {{{2*/ + /*}}}*/ + /*p= 7, npoint=13 {{{*/ static double wgt7[]={ -0.259062916308362, 0.304174548458604, 0.304174548458604, @@ -215,6 +215,6 @@ 0.638444188569810, 0.312865496004874, 0.048690315425316, 0.048690315425316}; - /*}}}2*/ - /*p= 8, npoint=16 {{{2*/ + /*}}}*/ + /*p= 8, npoint=16 {{{*/ static double wgt8[]={ 0.249961964823104, 0.164703541925695, 0.164703541925695, @@ -245,6 +245,6 @@ 0.728492392955404, 0.263112829634638, 0.008394777409958, 0.008394777409958}; - /*}}}2*/ - /*p= 9, npoint=19 {{{2*/ + /*}}}*/ + /*p= 9, npoint=19 {{{*/ static double wgt9[]={ 0.168244134395468, 0.054273292833345, 0.054273292833345, @@ -279,6 +279,6 @@ 0.741198598784498, 0.221962989160766, 0.036838412054736, 0.036838412054736}; - /*}}}2*/ - /*p=10, npoint=25 {{{2*/ + /*}}}*/ + /*p=10, npoint=25 {{{*/ static double wgt10[]={ 0.157301373584232, 0.063611224790829, 0.063611224790829, @@ -321,6 +321,6 @@ 0.923655933587500, 0.066803251012200, 0.009540815400299, 0.009540815400299}; - /*}}}2*/ - /*p=11, npoint=27 {{{2*/ + /*}}}*/ + /*p=11, npoint=27 {{{*/ static double wgt11[]={ 0.001605622060698, 0.001605622060698, 0.001605622060698, @@ -363,6 +363,6 @@ 0.807489003159792, 0.171488980304042, 0.807489003159792, 0.171488980304042, 0.021022016536166, 0.021022016536166}; - /*}}}2*/ - /*p=12, npoint=33 {{{2*/ + /*}}}*/ + /*p=12, npoint=33 {{{*/ static double wgt12[]={ 0.044567514407799, 0.044567514407799, 0.044567514407799, @@ -413,6 +413,6 @@ 0.858014033544073, 0.116251915907597, 0.858014033544073, 0.116251915907597, 0.025734050548330, 0.025734050548330}; - /*}}}2*/ - /* p=13, npoint=37 {{{2*/ + /*}}}*/ + /* p=13, npoint=37 {{{*/ static double wgt13[]={ 0.090968907790622, 0.019537784619314, 0.019537784619314, @@ -471,6 +471,6 @@ 0.851409537834241, 0.126357385491669, 0.022233076674090, 0.022233076674090}; - /*}}}2*/ - /*p=14, npoint=42{{{2*/ + /*}}}*/ + /*p=14, npoint=42{{{*/ static double wgt14[]={ 0.037903474783419, 0.037903474783419, 0.037903474783419, @@ -533,6 +533,6 @@ 0.879757171370171, 0.118974497696957, 0.879757171370171, 0.118974497696957, 0.001268330932872, 0.001268330932872}; - /*}}}2*/ - /*p=15, npoint=48{{{2*/ + /*}}}*/ + /*p=15, npoint=48{{{*/ static double wgt15[]={ 0.003320126005206, 0.003320126005206, 0.003320126005206, @@ -603,6 +603,6 @@ 0.883964574092416, 0.103575616576386, 0.883964574092416, 0.103575616576386, 0.012459809331199, 0.012459809331199}; - /*}}}2*/ - /*p=16, npoint=52 {{{2*/ + /*}}}*/ + /*p=16, npoint=52 {{{*/ static double wgt16[]={ 0.081191089584902, 0.011095307165226, 0.011095307165226, @@ -681,6 +681,6 @@ 0.900399064086661, 0.085283615682657, 0.014317320230681, 0.014317320230681}; - /*}}}2*/ - /*p=17, npoint=61{{{2*/ + /*}}}*/ + /*p=17, npoint=61{{{*/ static double wgt17[]={ 0.057914928034477, 0.008822054327014, 0.008822054327014, @@ -771,6 +771,6 @@ 0.904625504095608, 0.080711313679564, 0.014663182224828, 0.014663182224828}; - /*}}}2*/ - /* p=18, npoint=70 {{{2*/ + /*}}}*/ + /* p=18, npoint=70 {{{*/ static double wgt18[]={ @@ -874,6 +874,6 @@ 1.014347260005363, 0.020874755282586,-0.035222015287949, -0.035222015287949}; - /*}}}2*/ - /*p=19, npoint=73 {{{2*/ + /*}}}*/ + /*p=19, npoint=73 {{{*/ static double wgt19[]={ @@ -981,6 +981,6 @@ 0.924344252620784, 0.065494628082938, 0.010161119296278, 0.010161119296278}; - /*}}}2*/ - /*p=20, npoint=79 {{{2*/ + /*}}}*/ + /*p=20, npoint=79 {{{*/ static double wgt20[]={ 0.057256499746719, 0.001501721280705, 0.001501721280705, @@ -1095,5 +1095,5 @@ 0.929756171556853, 0.059696109149007, 0.010547719294141, 0.010547719294141}; - /*}}}2*/ + /*}}}*/ static double* wgtp[MAX_TRIA_SYM_ORD]={ @@ -1205,6 +1205,6 @@ return; -}/*}}}1*/ -/*FUNCTION GaussLegendreTetra{{{1*/ +}/*}}}*/ +/*FUNCTION GaussLegendreTetra{{{*/ void GaussLegendreTetra( int* pngaus, double** pl1, double** pl2, double** pl3, double** pl4, double** pwgt, int iord ) { /* Gauss quadrature points for the tetrahedron. @@ -1224,5 +1224,5 @@ /*Hardcoded Gauss points definition*/ - /*p= 1, npoint= 1 {{{2*/ + /*p= 1, npoint= 1 {{{*/ static double wgt1[]={ 1.000000000000000}; @@ -1235,6 +1235,6 @@ static double l41[]={ 0.250000000000000}; - /*}}}2*/ - /*p= 2, npoint= 4 {{{2*/ + /*}}}*/ + /*p= 2, npoint= 4 {{{*/ static double wgt2[]={ @@ -1253,6 +1253,6 @@ 0.138196601125011, 0.138196601125011, 0.138196601125011, 0.585410196624969}; - /*}}}2*/ - /*p= 3, npoint= 5 {{{2*/ + /*}}}*/ + /*p= 3, npoint= 5 {{{*/ static double wgt3[]={ -0.800000000000000, 0.450000000000000, 0.450000000000000, @@ -1270,6 +1270,6 @@ 0.250000000000000, 0.166666666666667, 0.166666666666667, 0.166666666666667, 0.500000000000000}; - /*}}}2*/ - /*p= 4, npoint=11 {{{2*/ + /*}}}*/ + /*p= 4, npoint=11 {{{*/ static double wgt4[]={ @@ -1298,6 +1298,6 @@ 0.100596423833201, 0.399403576166799, 0.100596423833201, 0.399403576166799, 0.399403576166799}; - /*}}}2*/ - /*p= 5, npoint=15 {{{2*/ + /*}}}*/ + /*p= 5, npoint=15 {{{*/ static double wgt5[]={ @@ -1331,6 +1331,6 @@ 0.433449846426336, 0.433449846426336, 0.066550153573664, 0.433449846426336, 0.066550153573664, 0.066550153573664}; - /*}}}2*/ - /*p= 6, npoint=24 {{{2*/ + /*}}}*/ + /*p= 6, npoint=24 {{{*/ static double wgt6[]={ @@ -1383,5 +1383,5 @@ 0.603005664791649, 0.269672331458316, 0.063661001875018, 0.063661001875018, 0.063661001875018, 0.063661001875018}; - /*}}}2*/ + /*}}}*/ static double* wgtp[MAX_TETRA_SYM_ORD]={wgt1,wgt2,wgt3,wgt4,wgt5,wgt6}; @@ -1470,6 +1470,6 @@ xfree((void **)&xgaus); } -}/*}}}1*/ -/*FUNCTION GaussLobatto{{{1*/ +}/*}}}*/ +/*FUNCTION GaussLobatto{{{*/ void GaussLobatto( double** pxgaus, double** pxwgt, int ngaus ) { /*Gauss-Lobatto quadrature points. @@ -1579,6 +1579,6 @@ } -}/*}}}1*/ -/*FUNCTION GaussRecur{{{1*/ +}/*}}}*/ +/*FUNCTION GaussRecur{{{*/ void GaussRecur( double* zero, double* weight, int n, double* alpha, double* beta ) { /*Gauss quadrature points from recursion coefficients. @@ -1700,8 +1700,8 @@ xfree((void **)&work); -}/*}}}1*/ +}/*}}}*/ /*Element Gauss points TO BE REMOVED*/ -/*FUNCTION gaussQuad{{{1*/ +/*FUNCTION gaussQuad{{{*/ void gaussQuad( double** pxgaus, double** pxwgt, double** pegaus, double** pewgt, int nigaus, int njgaus ) { /*Gauss quadrature points for the quadrilaterial.*/ @@ -1710,6 +1710,6 @@ GaussLegendreLinear(pxgaus, pxwgt, nigaus); GaussLegendreLinear(pegaus, pewgt, njgaus); -}/*}}}1*/ -/*FUNCTION gaussHexa{{{1*/ +}/*}}}*/ +/*FUNCTION gaussHexa{{{*/ void gaussHexa( double** pxgaus, double** pxwgt, double** pegaus, double** pewgt, double** pzgaus, double** pzwgt, int nigaus, int njgaus, int nkgaus ) { /*Gauss quadrature points for the hexahedron.*/ @@ -1719,3 +1719,3 @@ GaussLegendreLinear(pegaus, pewgt, njgaus); GaussLegendreLinear(pzgaus, pzwgt, nkgaus); -}/*}}}1*/ +}/*}}}*/ Index: /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh (revision 12364) +++ /issm/trunk-jpl/src/c/shared/Numerics/Synchronize.sh (revision 12365) @@ -8,5 +8,5 @@ #Get all lines of Verbosity.cpp cat Verbosity.h | grep "bool Verbose" | awk '{print $2}' | sed -e "s/(/ /" | awk '{print $1}' | awk '{ printf "%s %s\n", NR, $0 }' >temp -#Build header of Verbosity.cpp {{{1 +#Build header of Verbosity.cpp {{{ cat < Verbosity.cpp /* @@ -127,5 +127,5 @@ done -#Add footer of Verbosity.cpp{{{1 +#Add footer of Verbosity.cpp{{{ cat <> Verbosity.cpp @@ -147,5 +147,5 @@ END #}}} -#Complete verbose.m {{{1 +#Complete verbose.m {{{ VERBOSEPATH="$ISSM_DIR/src/m/classes/verbose.m" cat $VERBOSEPATH | sed "/%BEGINFIELDS/,$ d" > temp_begin Index: /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/shared/Numerics/UnitConversion.cpp (revision 12365) @@ -3,5 +3,5 @@ */ -/*headers {{{1*/ +/*headers {{{*/ #ifdef HAVE_CONFIG_H #include Index: /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/solutions/objectivefunction.cpp (revision 12365) @@ -3,5 +3,5 @@ */ -/*include files: {{{1*/ +/*include files: {{{*/ #ifdef HAVE_CONFIG_H #include Index: /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -19,5 +19,5 @@ /*SeqMat constructors and destructor*/ -/*FUNCTION SeqMat::SeqMat(){{{1*/ +/*FUNCTION SeqMat::SeqMat(){{{*/ SeqMat::SeqMat(){ @@ -27,5 +27,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::SeqMat(int M,int N){{{1*/ +/*FUNCTION SeqMat::SeqMat(int M,int N){{{*/ SeqMat::SeqMat(int pM,int pN){ @@ -36,5 +36,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::SeqMat(int M,int N, double sparsity){{{1*/ +/*FUNCTION SeqMat::SeqMat(int M,int N, double sparsity){{{*/ SeqMat::SeqMat(int pM,int pN, double sparsity){ @@ -45,5 +45,5 @@ } /*}}}*/ -/*FUNCTION SeqMat(double* serial_mat,int M,int N,double sparsity){{{1*/ +/*FUNCTION SeqMat(double* serial_mat,int M,int N,double sparsity){{{*/ SeqMat::SeqMat(double* serial_mat,int pM,int pN,double sparsity){ @@ -60,5 +60,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::SeqMat(int M,int N, int connectivity, int numberofdofspernode){{{1*/ +/*FUNCTION SeqMat::SeqMat(int M,int N, int connectivity, int numberofdofspernode){{{*/ SeqMat::SeqMat(int pM,int pN, int connectivity,int numberofdofspernode){ @@ -69,5 +69,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::~SeqMat(){{{1*/ +/*FUNCTION SeqMat::~SeqMat(){{{*/ SeqMat::~SeqMat(){ @@ -79,5 +79,5 @@ /*SeqMat specific routines: */ -/*FUNCTION SeqMat::Echo{{{1*/ +/*FUNCTION SeqMat::Echo{{{*/ void SeqMat::Echo(void){ @@ -92,5 +92,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::Assemble{{{1*/ +/*FUNCTION SeqMat::Assemble{{{*/ void SeqMat::Assemble(void){ @@ -99,5 +99,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::Norm{{{1*/ +/*FUNCTION SeqMat::Norm{{{*/ double SeqMat::Norm(NormMode mode){ @@ -124,5 +124,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::GetSize{{{1*/ +/*FUNCTION SeqMat::GetSize{{{*/ void SeqMat::GetSize(int* pM,int* pN){ @@ -132,5 +132,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::GetLocalSize{{{1*/ +/*FUNCTION SeqMat::GetLocalSize{{{*/ void SeqMat::GetLocalSize(int* pM,int* pN){ @@ -140,5 +140,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::MatMult{{{1*/ +/*FUNCTION SeqMat::MatMult{{{*/ void SeqMat::MatMult(SeqVec* X,SeqVec* AX){ @@ -163,5 +163,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::Duplicate{{{1*/ +/*FUNCTION SeqMat::Duplicate{{{*/ SeqMat* SeqMat::Duplicate(void){ @@ -172,5 +172,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::ToSerial{{{1*/ +/*FUNCTION SeqMat::ToSerial{{{*/ double* SeqMat::ToSerial(void){ @@ -185,5 +185,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::SetValues{{{1*/ +/*FUNCTION SeqMat::SetValues{{{*/ void SeqMat::SetValues(int m,int* idxm,int n,int* idxn,double* values,InsMode mode){ @@ -203,5 +203,5 @@ } /*}}}*/ -/*FUNCTION SeqMat::Convert{{{1*/ +/*FUNCTION SeqMat::Convert{{{*/ void SeqMat::Convert(MatrixType type){ Index: /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.h (revision 12364) +++ /issm/trunk-jpl/src/c/toolkits/issm/SeqMat.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -26,5 +26,5 @@ double* matrix; - /*SeqMat constructors, destructors {{{1*/ + /*SeqMat constructors, destructors {{{*/ SeqMat(); SeqMat(int M,int N); @@ -34,5 +34,5 @@ ~SeqMat(); /*}}}*/ - /*SeqMat specific routines {{{1*/ + /*SeqMat specific routines {{{*/ void Echo(void); void Assemble(void); Index: /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.cpp (revision 12365) @@ -4,5 +4,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -19,5 +19,5 @@ /*SeqVec constructors and destructor*/ -/*FUNCTION SeqVec::SeqVec(){{{1*/ +/*FUNCTION SeqVec::SeqVec(){{{*/ SeqVec::SeqVec(){ @@ -26,5 +26,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::SeqVec(int M,bool fromlocalsize){{{1*/ +/*FUNCTION SeqVec::SeqVec(int M,bool fromlocalsize){{{*/ SeqVec::SeqVec(int pM,bool fromlocalsize){ @@ -34,5 +34,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::SeqVec(double* serial_vec,int M){{{1*/ +/*FUNCTION SeqVec::SeqVec(double* serial_vec,int M){{{*/ SeqVec::SeqVec(double* buffer,int pM){ @@ -47,5 +47,5 @@ } /*}}}*/ - /*FUNCTION SeqVec::~SeqVec(){{{1*/ + /*FUNCTION SeqVec::~SeqVec(){{{*/ SeqVec::~SeqVec(){ xfree((void**)&this->vector); @@ -55,5 +55,5 @@ /*SeqVec specific routines: */ -/*FUNCTION SeqVec::Echo{{{1*/ +/*FUNCTION SeqVec::Echo{{{*/ void SeqVec::Echo(void){ @@ -66,5 +66,5 @@ /*}}}*/ -/*FUNCTION SeqVec::Assemble{{{1*/ +/*FUNCTION SeqVec::Assemble{{{*/ void SeqVec::Assemble(void){ @@ -73,5 +73,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::SetValues{{{1*/ +/*FUNCTION SeqVec::SetValues{{{*/ void SeqVec::SetValues(int ssize, int* list, double* values, InsMode mode){ @@ -91,5 +91,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::SetValue{{{1*/ +/*FUNCTION SeqVec::SetValue{{{*/ void SeqVec::SetValue(int dof, double value, InsMode mode){ @@ -107,5 +107,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::GetValue{{{1*/ +/*FUNCTION SeqVec::GetValue{{{*/ void SeqVec::GetValue(double* pvalue,int dof){ @@ -115,5 +115,5 @@ /*}}}*/ -/*FUNCTION SeqVec::GetSize{{{1*/ +/*FUNCTION SeqVec::GetSize{{{*/ void SeqVec::GetSize(int* pM){ @@ -122,5 +122,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::GetLocalSize{{{1*/ +/*FUNCTION SeqVec::GetLocalSize{{{*/ void SeqVec::GetLocalSize(int* pM){ @@ -129,5 +129,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::Duplicate{{{1*/ +/*FUNCTION SeqVec::Duplicate{{{*/ SeqVec* SeqVec::Duplicate(void){ @@ -136,5 +136,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::Set{{{1*/ +/*FUNCTION SeqVec::Set{{{*/ void SeqVec::Set(double value){ @@ -144,5 +144,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::AXPY{{{1*/ +/*FUNCTION SeqVec::AXPY{{{*/ void SeqVec::AXPY(SeqVec* X, double a){ @@ -154,5 +154,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::AYPX{{{1*/ +/*FUNCTION SeqVec::AYPX{{{*/ void SeqVec::AYPX(SeqVec* X, double a){ @@ -164,5 +164,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::ToMPISerial{{{1*/ +/*FUNCTION SeqVec::ToMPISerial{{{*/ double* SeqVec::ToMPISerial(void){ @@ -177,5 +177,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::Copy{{{1*/ +/*FUNCTION SeqVec::Copy{{{*/ void SeqVec::Copy(SeqVec* to){ @@ -187,5 +187,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::Norm{{{1*/ +/*FUNCTION SeqVec::Norm{{{*/ double SeqVec::Norm(NormMode mode){ @@ -209,5 +209,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::Scale{{{1*/ +/*FUNCTION SeqVec::Scale{{{*/ void SeqVec::Scale(double scale_factor){ @@ -217,5 +217,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::Dot{{{1*/ +/*FUNCTION SeqVec::Dot{{{*/ double SeqVec::Dot(SeqVec* input){ @@ -228,5 +228,5 @@ } /*}}}*/ -/*FUNCTION SeqVec::PointwiseDivide{{{1*/ +/*FUNCTION SeqVec::PointwiseDivide{{{*/ void SeqVec::PointwiseDivide(SeqVec* x,SeqVec* y){ Index: /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.h =================================================================== --- /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.h (revision 12364) +++ /issm/trunk-jpl/src/c/toolkits/issm/SeqVec.h (revision 12365) @@ -7,5 +7,5 @@ /*Headers:*/ -/*{{{1*/ +/*{{{*/ #ifdef HAVE_CONFIG_H #include @@ -25,5 +25,5 @@ int M; - /*SeqVec constructors, destructors {{{1*/ + /*SeqVec constructors, destructors {{{*/ SeqVec(); SeqVec(int M,bool fromlocalsize=false); @@ -31,5 +31,5 @@ ~SeqVec(); /*}}}*/ - /*SeqVec specific routines {{{1*/ + /*SeqVec specific routines {{{*/ void Echo(void); void Assemble(void); Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp =================================================================== --- /issm/trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp (revision 12364) +++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp (revision 12365) @@ -20,5 +20,5 @@ #include "../../mpi/patches/mpipatches.h" -/*NewMat(int M,int N){{{1*/ +/*NewMat(int M,int N){{{*/ Mat NewMat(int M,int N){ @@ -48,5 +48,5 @@ } /*}}}*/ -/*NewMat(int M,int N,double sparsity){{{1*/ +/*NewMat(int M,int N,double sparsity){{{*/ Mat NewMat(int M,int N,double sparsity){ @@ -81,5 +81,5 @@ } /*}}}*/ -/*NewMat(int M,int N,int connectivity,int numberofdofspernode){{{1*/ +/*NewMat(int M,int N,int connectivity,int numberofdofspernode){{{*/ Mat NewMat(int M,int N,int connectivity,int numberofdofspernode){ Index: /issm/trunk-jpl/src/m/classes/bamggeom.m =================================================================== --- /issm/trunk-jpl/src/m/classes/bamggeom.m (revision 12364) +++ /issm/trunk-jpl/src/m/classes/bamggeom.m (revision 12365) @@ -6,5 +6,5 @@ classdef bamggeom properties (SetAccess=public) - % {{{1 + % {{{ Vertices=[]; Edges=[]; @@ -18,5 +18,5 @@ end methods - function bg = bamggeom(varargin)% {{{1 + function bg = bamggeom(varargin)% {{{ %BAMGGEOM - constructor for bamggeom object % @@ -44,5 +44,5 @@ end end%}}} - function display(bg)% {{{1 + function display(bg)% {{{ disp(sprintf('\n%s = \n',inputname(1))); disp(struct(bg)) Index: /issm/trunk-jpl/src/m/classes/bamgmesh.m =================================================================== --- /issm/trunk-jpl/src/m/classes/bamgmesh.m (revision 12364) +++ /issm/trunk-jpl/src/m/classes/bamgmesh.m (revision 12365) @@ -6,5 +6,5 @@ classdef bamgmesh properties (SetAccess=public) - % {{{1 + % {{{ Vertices=[]; Edges=[]; @@ -26,5 +26,5 @@ end methods - function bg = bamgmesh(varargin)% {{{1 + function bg = bamgmesh(varargin)% {{{ switch nargin @@ -48,5 +48,5 @@ end end%}}} - function display(bm)% {{{1 + function display(bm)% {{{ disp(sprintf('\n%s = \n',inputname(1))); disp(struct(bm)) Index: /issm/trunk-jpl/src/m/classes/model/model.m =================================================================== --- /issm/trunk-jpl/src/m/classes/model/model.m (revision 12364) +++ /issm/trunk-jpl/src/m/classes/model/model.m (revision 12365) @@ -6,5 +6,5 @@ classdef model properties (SetAccess=public) %Model fields - % {{{1 + % {{{ %Careful here: no other class should be used as default value this is a bug of matlab mesh = 0; @@ -75,5 +75,5 @@ end methods - function md = model(varargin) % {{{1 + function md = model(varargin) % {{{ switch nargin @@ -357,5 +357,5 @@ end% }}} - function md = setdefaultparameters(md) % {{{1 + function md = setdefaultparameters(md) % {{{ %initialize subclasses Index: /issm/trunk-jpl/src/m/classes/model/planet.m =================================================================== --- /issm/trunk-jpl/src/m/classes/model/planet.m (revision 12364) +++ /issm/trunk-jpl/src/m/classes/model/planet.m (revision 12365) @@ -6,5 +6,5 @@ classdef planet < model properties (SetAccess=public) %Planet fields - % {{{1 + % {{{ %Planet specific fields r=NaN; @@ -14,5 +14,5 @@ end methods - function md=planetmesh(md,varargin) % {{{1 + function md=planetmesh(md,varargin) % {{{ %PLANETMESH: build 2d shell mesh % Index: /issm/trunk-jpl/src/m/classes/organizer.m =================================================================== --- /issm/trunk-jpl/src/m/classes/organizer.m (revision 12364) +++ /issm/trunk-jpl/src/m/classes/organizer.m (revision 12365) @@ -16,5 +16,5 @@ classdef organizer properties (SetAccess=private) - % {{{1 + % {{{ currentstep =0; end @@ -28,5 +28,5 @@ end methods - function org=organizer(varargin) % {{{1 + function org=organizer(varargin) % {{{ %process options @@ -57,5 +57,5 @@ end %}}} - function disp(org) % {{{1 + function disp(org) % {{{ disp(sprintf(' Repository: ''%s''',org.repository)); disp(sprintf(' Prefix: ''%s''',org.prefix)); @@ -69,5 +69,5 @@ end %}}} - function md=loadmodel(org,string),% {{{1 + function md=loadmodel(org,string),% {{{ %Get model path @@ -95,5 +95,5 @@ end end%}}} - function bool=perform(org,string) % {{{1 + function bool=perform(org,string) % {{{ bool=false; @@ -129,5 +129,5 @@ end%}}} - function savemodel(org,md) % {{{1 + function savemodel(org,md) % {{{ %check Index: /issm/trunk-jpl/src/m/classes/plotoptions.m =================================================================== --- /issm/trunk-jpl/src/m/classes/plotoptions.m (revision 12364) +++ /issm/trunk-jpl/src/m/classes/plotoptions.m (revision 12365) @@ -6,5 +6,5 @@ classdef plotoptions properties (SetAccess=public) - % {{{1 + % {{{ numberofplots = 0; figurenumber = 1; @@ -13,9 +13,9 @@ end methods - function opt=plotoptions(varargin) % {{{1 + function opt=plotoptions(varargin) % {{{ opt=buildlist(opt,varargin{:}); end %}}} - function disp(opt) % {{{1 + function disp(opt) % {{{ disp(sprintf('\n%s = \n',inputname(1))); disp(sprintf(' numberofplots: %i',opt.numberofplots)); @@ -41,5 +41,5 @@ end %}}} - function opt=buildlist(opt,varargin) % {{{1 + function opt=buildlist(opt,varargin) % {{{ %check length of input Index: /issm/trunk-jpl/src/m/classes/solver.m =================================================================== --- /issm/trunk-jpl/src/m/classes/solver.m (revision 12364) +++ /issm/trunk-jpl/src/m/classes/solver.m (revision 12365) @@ -18,5 +18,5 @@ end end % }}} - function obj = addoptions(obj,analysis,varargin) % {{{1 + function obj = addoptions(obj,analysis,varargin) % {{{ % Usage example: % md.solver=addoptions(md.solver,DiagnosticHorizAnalysisEnum,stokesoptions()); Index: /issm/trunk-jpl/src/m/classes/verbose.m =================================================================== --- /issm/trunk-jpl/src/m/classes/verbose.m (revision 12364) +++ /issm/trunk-jpl/src/m/classes/verbose.m (revision 12365) @@ -21,5 +21,5 @@ classdef verbose properties (SetAccess=public) - % {{{1 + % {{{ %BEGINFIELDS mprocessor = false; @@ -35,5 +35,5 @@ %}}} methods - function verbose=verbose(varargin) % {{{1 + function verbose=verbose(varargin) % {{{ switch(nargin), @@ -70,5 +70,5 @@ end %}}} - function binary=VerboseToBinary(verbose) % {{{1 + function binary=VerboseToBinary(verbose) % {{{ %BEGINVERB2BIN @@ -85,5 +85,5 @@ end %}}} - function verbose=BinaryToVerbose(verbose,binary) % {{{1 + function verbose=BinaryToVerbose(verbose,binary) % {{{ %BEGINBIN2VERB @@ -102,5 +102,5 @@ end % }}} - function disp(verbose) % {{{1 + function disp(verbose) % {{{ %BEGINDISP Index: /issm/trunk-jpl/src/m/model/WriteData.m =================================================================== --- /issm/trunk-jpl/src/m/model/WriteData.m (revision 12364) +++ /issm/trunk-jpl/src/m/model/WriteData.m (revision 12365) @@ -233,5 +233,5 @@ enum=eval([string 'Enum();']); end % }}} -function code=FormatToCode(format) % {{{1 +function code=FormatToCode(format) % {{{ %This routine takes the format string, and hardcodes it into an integer, which %is passed along the record, in order to identify the nature of the dataset being Index: /issm/trunk-jpl/src/m/model/mesh/bamg.m =================================================================== --- /issm/trunk-jpl/src/m/model/mesh/bamg.m (revision 12364) +++ /issm/trunk-jpl/src/m/model/mesh/bamg.m (revision 12365) @@ -58,5 +58,5 @@ bamg_mesh=bamgmesh; -% Bamg Geometry parameters {{{1 +% Bamg Geometry parameters {{{ if exist(options,'domain'), @@ -259,5 +259,5 @@ end %}}} -% Bamg Mesh parameters {{{1 +% Bamg Mesh parameters {{{ if (~exist(options,'domain') & md.mesh.numberofvertices~=0 & md.mesh.dimension==2), @@ -274,5 +274,5 @@ end %}}} -% Bamg Options {{{1 +% Bamg Options {{{ bamg_options.Crack=getfieldvalue(options,'Crack',0); bamg_options.anisomax=getfieldvalue(options,'anisomax',10^30); Index: /issm/trunk-jpl/src/m/model/setmask.m =================================================================== --- /issm/trunk-jpl/src/m/model/setmask.m (revision 12364) +++ /issm/trunk-jpl/src/m/model/setmask.m (revision 12365) @@ -25,5 +25,5 @@ elements=md.mesh.elements; -%Assign elementonfloatingice, elementongroundedice, vertexongroundedice and vertexonfloatingice. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{1 +%Assign elementonfloatingice, elementongroundedice, vertexongroundedice and vertexonfloatingice. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{ elementonfloatingice=FlagElements(md,floatingicename); elementongroundedice=FlagElements(md,groundedicename); Index: /issm/trunk-jpl/src/m/model/setmask.py =================================================================== --- /issm/trunk-jpl/src/m/model/setmask.py (revision 12364) +++ /issm/trunk-jpl/src/m/model/setmask.py (revision 12365) @@ -22,5 +22,5 @@ elements = md.mesh.elements - #Assign elementonfloatingice, elementongroundedice, vertexongroundedice and vertexonfloatingice. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{1 + #Assign elementonfloatingice, elementongroundedice, vertexongroundedice and vertexonfloatingice. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{ elementonfloatingice = fe.FlagElements(md, floatingicename) elementongroundedice = fe.FlagElements(md, groundedicename) Index: /issm/trunk-jpl/src/m/qmu/preqmu.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/preqmu.m (revision 12364) +++ /issm/trunk-jpl/src/m/qmu/preqmu.m (revision 12365) @@ -44,5 +44,5 @@ responses=expandresponses(md,responses); -%go through variables and responses, and check they don't have more than md.qmu.numberofpartitions values. Also determine numvariables and numresponses{{{1 +%go through variables and responses, and check they don't have more than md.qmu.numberofpartitions values. Also determine numvariables and numresponses{{{ numvariables=0; variable_fieldnames=fieldnames(variables); @@ -76,5 +76,5 @@ system(['rm -rf ' md.miscellaneous.name '.m']); -%build a list of variables and responses descriptors. the list is not expanded. {{{1 +%build a list of variables and responses descriptors. the list is not expanded. {{{ variabledescriptors={}; variable_fieldnames=fieldnames(md.qmu.variables(options.ivar));