Changeset 18135

Timestamp:

06/10/14 16:22:42 (11 years ago)

Author:

Mathieu Morlighem

Message:

DEL: removed some modules not needed anymore

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (1 diff)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Seg.h (modified) (1 diff)
• classes/Elements/Tetra.h (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (1 diff)
• classes/Elements/Tria.h (modified) (1 diff)
• modules/ControlInputGetGradientx (deleted)
• modules/ControlInputScaleGradientx (deleted)
• modules/modules.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -376 +376 @@
                                         ./cores/thermal_core.cpp\
                                         ./solutionsequences/solutionsequence_thermal_nonlinear.cpp\
-                                        ./modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp\
-                                        ./modules/ControlInputGetGradientx/ControlInputGetGradientx.h\
                                         ./modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp\
                                         ./modules/ControlInputSetGradientx/ControlInputSetGradientx.h\
-                                        ./modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp\
-                                        ./modules/ControlInputScaleGradientx/ControlInputScaleGradientx.h\
                                         ./modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp\
                                         ./modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h\

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -270 +270 @@
                 #endif
 
-                virtual void   ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index)=0;
                 virtual void   ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index)=0;
-                virtual void   ControlInputScaleGradient(int enum_type, IssmDouble scale)=0;
                 virtual void   ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum)=0;
                 virtual void   GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data)=0;

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -2690 +2690 @@
 #endif
 
-void       Penta::ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index){/*{{{*/
-
-        int vertexpidlist[NUMVERTICES];
-        Input* input=NULL;
-
-        if(enum_type==MaterialsRheologyBbarEnum){
-                if(!IsOnBase()) return;
-                input=(Input*)inputs->GetInput(MaterialsRheologyBEnum);
-        }
-        else if(enum_type==DamageDbarEnum){
-                if(!IsOnBase()) return;
-                input=(Input*)inputs->GetInput(DamageDEnum);
-        }
-        else{
-                input=inputs->GetInput(enum_type);
-        }
-        if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found");
-        if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
-
-        GradientIndexing(&vertexpidlist[0],control_index);
-        ((ControlInput*)input)->GetGradient(gradient,&vertexpidlist[0]);
-
-}/*}}}*/
-void       Penta::ControlInputScaleGradient(int enum_type,IssmDouble scale){/*{{{*/
-
-        Input* input=NULL;
-
-        if(enum_type==MaterialsRheologyBbarEnum){
-                input=(Input*)inputs->GetInput(MaterialsRheologyBEnum);
-        }
-        else if(enum_type==DamageDbarEnum){
-                input=(Input*)inputs->GetInput(DamageDEnum);
-        }
-        else{
-                input=inputs->GetInput(enum_type);
-        }
-        if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found");
-        if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
-
-        ((ControlInput*)input)->ScaleGradient(scale);
-}/*}}}*/
 void       Penta::ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index){/*{{{*/
 

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -122 +122 @@
                 void   GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data);
                 void   SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index);
-                void   ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index);
-                void   ControlInputScaleGradient(int enum_type,IssmDouble scale);
                 void   ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index);
                 void   ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum);

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -158 +158 @@
                 void       GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data){_error_("not implemented yet");};
                 void       SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index){_error_("not implemented yet");};
-                void       ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index){_error_("not implemented yet");};
-                void       ControlInputScaleGradient(int enum_type,IssmDouble scale){_error_("not implemented yet");};
                 void       ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index){_error_("not implemented yet");};
                 void       ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tetra.h

@@ -164 +164 @@
                 void       GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data){_error_("not implemented yet");};
                 void       SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index){_error_("not implemented yet");};
-                void       ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index){_error_("not implemented yet");};
-                void       ControlInputScaleGradient(int enum_type,IssmDouble scale){_error_("not implemented yet");};
                 void       ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index){_error_("not implemented yet");};
                 void       ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -2605 +2605 @@
 }
 /*}}}*/
-void       Tria::ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index){/*{{{*/
-
-        int vertexpidlist[NUMVERTICES];
-
-        Input* input=inputs->GetInput(enum_type);
-        if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found");
-        if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
-
-        GradientIndexing(&vertexpidlist[0],control_index);
-        ((ControlInput*)input)->GetGradient(gradient,&vertexpidlist[0]);
-
-}/*}}}*/
-void       Tria::ControlInputScaleGradient(int enum_type,IssmDouble scale){/*{{{*/
-
-        Input* input=inputs->GetInput(enum_type);
-        if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found");
-        if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
-
-        ((ControlInput*)input)->ScaleGradient(scale);
-}/*}}}*/
 void       Tria::ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index){/*{{{*/
 

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -127 +127 @@
                 void       GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data);
                 void       SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index);
-                void       ControlInputGetGradient(Vector<IssmDouble>* gradient,int enum_type,int control_index);
-                void       ControlInputScaleGradient(int enum_type,IssmDouble scale);
                 void       ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index);
                 void       ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum);

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

@@ -16 +16 @@
 #include "./ContourToMeshx/ContourToMeshx.h"
 #include "./ContourToNodesx/ContourToNodesx.h"
-#include "./ControlInputGetGradientx/ControlInputGetGradientx.h"
 #include "./ControlInputSetGradientx/ControlInputSetGradientx.h"
-#include "./ControlInputScaleGradientx/ControlInputScaleGradientx.h"
 #include "./CreateNodalConstraintsx/CreateNodalConstraintsx.h"
 #include "./CreateJacobianMatrixx/CreateJacobianMatrixx.h"