Changeset 5513

Timestamp:

08/23/10 13:56:13 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added InfinityNorm methods for inputs

Location:

issm/trunk/src/c/objects/Inputs

Files:

• BoolInput.h (modified) (1 diff)
• DoubleInput.h (modified) (1 diff)
• Input.h (modified) (2 diffs)
• IntInput.h (modified) (1 diff)
• PentaVertexInput.cpp (modified) (1 diff)
• PentaVertexInput.h (modified) (1 diff)
• TriaVertexInput.cpp (modified) (1 diff)
• TriaVertexInput.h (modified) (1 diff)

issm/trunk/src/c/objects/Inputs/BoolInput.h

@@ -60 +60 @@
                 void SquareMin(double* psquaremin, bool process_units,Parameters* parameters);
                 void ConstrainMin(double minimum){ISSMERROR("not implemented yet");};
+                double InfinityNorm(void){ISSMERROR("InfinityNorm not implemented for booleans");};
                 void Scale(double scale_factor);
                 void AXPY(Input* xinput,double scalar);

issm/trunk/src/c/objects/Inputs/DoubleInput.h

@@ -62 +62 @@
                 void AXPY(Input* xinput,double scalar);
                 void Constrain(double cm_min, double cm_max);
+                double InfinityNorm(void){ISSMERROR("not implemented yet");};
                 void Extrude(void){ISSMERROR("not supported yet");};
                 void VerticallyIntegrate(Input* thickness_input);

issm/trunk/src/c/objects/Inputs/Input.h

@@ -36 +36 @@
                 virtual void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss)=0;
                 virtual void ChangeEnum(int newenumtype)=0;
-                
-                virtual Input* SpawnTriaInput(int* indices)=0;
-                virtual Input* PointwiseDivide(Input* inputB)=0;
-                virtual ElementResult* SpawnResult(int step, double time)=0;
+
                 virtual void SquareMin(double* psquaremin, bool process_units,Parameters* parameters)=0;
                 virtual void ConstrainMin(double minimum)=0;
+                virtual double InfinityNorm(void)=0;
                 virtual void Scale(double scale_factor)=0;
                 virtual void AXPY(Input* xinput,double scalar)=0;
@@ -49 +47 @@
                 virtual void GetVectorFromInputs(Vec vector,int* doflist)=0;
                 virtual void GetValuesPtr(double** pvalues,int* pnum_values)=0;
+                
+                virtual Input* SpawnTriaInput(int* indices)=0;
+                virtual Input* PointwiseDivide(Input* inputB)=0;
+                virtual ElementResult* SpawnResult(int step, double time)=0;
+
                 /*}}}*/
 

issm/trunk/src/c/objects/Inputs/IntInput.h

@@ -63 +63 @@
                 void AXPY(Input* xinput,double scalar);
                 void Constrain(double cm_min, double cm_max);
+                double InfinityNorm(void){ISSMERROR("InfinityNorm not implemented for integers");};
                 void Extrude(void){ISSMERROR("not supported yet");};
                 void VerticallyIntegrate(Input* thickness_input){ISSMERROR("not supported yet");};

issm/trunk/src/c/objects/Inputs/PentaVertexInput.cpp

@@ -438 +438 @@
 }
 /*}}}*/
+/*FUNCTION PentaVertexInput::InfinityNorm{{{1*/
+double PentaVertexInput::InfinityNorm(void){
+
+        /*Output*/
+        const int numgrids=6;
+        double norm=0;
+
+        for(int i=0;i<numgrids;i++) if(fabs(values[i])>norm) norm=fabs(values[i]);
+        return norm;
+}
+/*}}}*/
 /*FUNCTION PentaVertexInput::Scale{{{1*/
 void PentaVertexInput::Scale(double scale_factor){

issm/trunk/src/c/objects/Inputs/PentaVertexInput.h

@@ -64 +64 @@
                 void AXPY(Input* xinput,double scalar);
                 void Constrain(double cm_min, double cm_max);
+                double InfinityNorm(void);
                 void Extrude(void);
                 void VerticallyIntegrate(Input* thickness_input);

issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp

@@ -290 +290 @@
 }
 /*}}}*/
+/*FUNCTION TriaVertexInput::InfinityNorm{{{1*/
+double TriaVertexInput::InfinityNorm(void){
+
+        /*Output*/
+        double norm=0;
+        const int numgrids=3;
+
+        for(int i=0;i<numgrids;i++) if(fabs(values[i])>norm) norm=fabs(values[i]);
+        return norm;
+}
+/*}}}*/
 /*FUNCTION TriaVertexInput::Scale{{{1*/
 void TriaVertexInput::Scale(double scale_factor){

issm/trunk/src/c/objects/Inputs/TriaVertexInput.h

@@ -64 +64 @@
                 void AXPY(Input* xinput,double scalar);
                 void Constrain(double cm_min, double cm_max);
+                double InfinityNorm(void);
                 void Extrude(void){ISSMERROR("not supported yet");};
                 void VerticallyIntegrate(Input* thickness_input){ISSMERROR("not supported yet");};