Changeset 4943

Timestamp:

08/03/10 09:43:56 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added DuplicateInput method of inputs called by InputDuplicate

Location:

issm/trunk/src/c

Files:

• Container/Inputs.cpp (modified) (2 diffs)
• Container/Inputs.h (modified) (2 diffs)
• objects/Elements/Penta.cpp (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (1 diff)

issm/trunk/src/c/Container/Inputs.cpp

@@ -315 +315 @@
 }
 /*}}}*/
+/*FUNCTION Inputs::ChangeEnum{{{1*/
+void  Inputs::ChangeEnum(int oldenumtype,int newenumtype){
+
+        /*Go through dataset of inputs and look for input with 
+         * same enum as input enum, once found, just change its name */
+        vector<Object*>::iterator object;
+        Input* input=NULL;
+
+        /*Delete existing input of newenumtype if it exists*/
+        for ( object=objects.begin() ; object < objects.end(); object++ ){
+                input=(Input*)(*object); 
+
+                if (input->EnumType()==newenumtype){
+                        this->DeleteObject(input);
+                        break;
+                }
+        }
+
+        /*Change enum_type of input of oldenumtype*/
+        for ( object=objects.begin() ; object < objects.end(); object++ ){
+
+                input=(Input*)(*object); 
+
+                if (input->EnumType()==oldenumtype){
+                        input->ChangeEnum(newenumtype);
+                        break;
+                }
+        }
+}
+/*}}}*/
 /*FUNCTION Inputs::GetInput{{{1*/
 Input* Inputs::GetInput(int enum_name){
@@ -352 +382 @@
 }
 /*}}}*/
-/*FUNCTION Inputs::ChangeEnum{{{1*/
-void  Inputs::ChangeEnum(int oldenumtype,int newenumtype){
-
-        /*Go through dataset of inputs and look for input with 
-         * same enum as input enum, once found, just change its name */
-        vector<Object*>::iterator object;
-        Input* input=NULL;
-
-        /*Delete existing input of newenumtype if it exists*/
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
-                input=(Input*)(*object); 
-
-                if (input->EnumType()==newenumtype){
-                        this->DeleteObject(input);
-                        break;
-                }
-        }
-
-        /*Change enum_type of input of oldenumtype*/
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
-
-                input=(Input*)(*object); 
-
-                if (input->EnumType()==oldenumtype){
-                        input->ChangeEnum(newenumtype);
-                        break;
-                }
-        }
+/*FUNCTION Inputs::DuplicateInput{{{1*/
+void  Inputs::DuplicateInput(int original_enum,int new_enum){
+
+        Input* original=NULL;
+        Input* copy=NULL;
+
+        /*Make a copy of the original input: */
+        original=(Input*)this->GetInput(original_enum);
+        if(!original)ISSMERROR("could not find input with enum: %s",EnumAsString(original_enum)); 
+        copy=(Input*)original->copy();
+
+        /*Change copy enum to reinitialized_enum: */
+        copy->ChangeEnum(new_enum);
+
+        /*Add copy into inputs, it will wipe off the one already there: */
+        this->AddInput((Input*)copy);
 }
 /*}}}*/

issm/trunk/src/c/Container/Inputs.h

@@ -29 +29 @@
                 /*numerics: {{{1*/
                 int     AddInput(Input* in_input);
+                void    ChangeEnum(int enumtype,int new_enumtype);
                 int     DeleteInput(int enum_type);
+                void    DuplicateInput(int original_enum,int new_enum);
                 Input*  GetInput(int enum_name);
                 Inputs* SpawnTriaInputs(int* indices);
                 
+                void GetParameterAverage(double* pvalue, int enum_type);
                 void GetParameterValue(bool* pvalue,int enum_type);
                 void GetParameterValue(int* pvalue,int enum_type);
@@ -38 +41 @@
                 void GetParameterValue(double* pvalue,double* gauss,int enum_type);
                 void GetParameterValue(double* pvalue,double* gauss,int enum_type,double defaultvalue);
-                void GetParameterAverage(double* pvalue, int enum_type);
-                
                 void GetParameterValues(double* values,double* gauss_pointers, int numgauss,int enum_type);
                 void GetParameterValues(double* values,double* gauss_pointers, int numgauss,int enum_type,double* defaultvalues);
-        
                 void GetParameterDerivativeValue(double* derivativevalues, double* xyz_list, double* gauss,int enum_type);
-
-                void ChangeEnum(int enumtype,int new_enumtype);
-
                 /*}}}*/
 

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -1130 +1130 @@
 void  Penta::InputDuplicate(int original_enum,int new_enum){
 
-        Input* original=NULL;
-        Input* copy=NULL;
-
-        /*Make a copy of the original input: */
-        original=(Input*)this->inputs->GetInput(original_enum);
-        if(!original)ISSMERROR(" could not find old input with enum: %s",EnumAsString(original_enum)); 
-        copy=(Input*)original->copy();
-
-        /*Change copy enum to reinitialized_enum: */
-        copy->ChangeEnum(new_enum);
-
-        /*Add copy into inputs, it will wipe off the one already there: */
-        inputs->AddInput((Input*)copy);
+        /*Call inputs method*/
+        inputs->DuplicateInput(original_enum,new_enum);
+
 }
 /*}}}*/

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -1318 +1318 @@
 void  Tria::InputDuplicate(int original_enum,int new_enum){
 
-        Input* original=NULL;
-        Input* copy=NULL;
-
-        /*Make a copy of the original input: */
-        original=(Input*)this->inputs->GetInput(original_enum);
-        if(!original)ISSMERROR(" could not find old input with enum: %s",EnumAsString(original_enum));
-        copy=(Input*)original->copy();
-
-        /*Change copy enum to reinitialized_enum: */
-        copy->ChangeEnum(new_enum);
-
-        /*Add copy into inputs, it will wipe off the one already there: */
-        inputs->AddInput((Input*)copy);
+        /*Call inputs method*/
+        inputs->DuplicateInput(original_enum,new_enum);
+
 }
 /*}}}*/