Changeset 4907

Timestamp:

07/30/10 12:26:24 (15 years ago)

Author:

seroussi

Message:

remove c/modules/FieldAverageOntoVerticesx and c/modules/FieldDepthAveragex

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (2 diffs)
• modules/FieldAverageOntoVerticesx (deleted)
• modules/FieldDepthAveragex (deleted)
• modules/modules.h (modified) (1 diff)
• objects/Node.cpp (modified) (1 diff)
• objects/Node.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -548 +548 @@
                                         ./modules/Qmux/SpawnCore.cpp\
                                         ./modules/Qmux/SpawnCoreSerial.cpp\
-                                        ./modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp\
-                                        ./modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h\
-                                        ./modules/FieldDepthAveragex/FieldDepthAveragex.cpp\
-                                        ./modules/FieldDepthAveragex/FieldDepthAveragex.h\
                                         ./modules/InputDepthAveragex/InputDepthAveragex.cpp\
                                         ./modules/InputDepthAveragex/InputDepthAveragex.h\
@@ -1099 +1095 @@
                                         ./modules/Qmux/SpawnCore.cpp\
                                         ./modules/Qmux/SpawnCoreParallel.cpp\
-                                        ./modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp\
-                                        ./modules/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h\
-                                        ./modules/FieldDepthAveragex/FieldDepthAveragex.cpp\
-                                        ./modules/FieldDepthAveragex/FieldDepthAveragex.h\
                                         ./modules/InputDepthAveragex/InputDepthAveragex.cpp\
                                         ./modules/InputDepthAveragex/InputDepthAveragex.h\

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

@@ -22 +22 @@
 #include "./DakotaResponsesx/DakotaResponsesx.h"
 #include "./ElementConnectivityx/ElementConnectivityx.h"
-#include "./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h"
-#include "./FieldDepthAveragex/FieldDepthAveragex.h"
 #include "./GetSolutionFromInputsx/GetSolutionFromInputsx.h"
 #include "./GetVectorFromInputsx/GetVectorFromInputsx.h"

issm/trunk/src/c/objects/Node.cpp

@@ -502 +502 @@
 }
 /*}}}*/
-/*FUNCTION Node::FieldAverageOntoVertices{{{1*/
-void  Node::FieldAverageOntoVertices(Vec fieldsum,Vec connectivity,double* field){
-
-        /*Intermediary*/
-        int vertexdof;
-        int index;
-        double value;
-
-        /*Skip if clone*/
-        if (indexing.clone==1) return;
-
-        /*Check dofpernode*/
-        if (indexing.numberofdofs!=1) ISSMERROR("only one dof suppoerted yet");
-
-        /*Get value at node*/
-        index=indexing.doflist[0];
-        value=field[index];
-
-        /*Add values to the two vectors*/
-        vertexdof=this->GetVertexDof();
-        VecSetValue(fieldsum,    vertexdof,value,ADD_VALUES);
-        VecSetValue(connectivity,vertexdof,1.0,  ADD_VALUES);
-}
-/*}}}*/
-/*FUNCTION Node::FieldDepthAverageAtBase{{{1*/
-void  Node::FieldDepthAverageAtBase(Vec field,double* field_serial,char* fieldname){
-
-        /* node data: */
-        int          vertexdof;
-        int          dofx,dofy;
-        int          isnodeonsurface;
-
-        bool onbed;
-        bool onsurface;
-        
-        Node* node=NULL;
-        Node* upper_node=NULL;
-        double z1,z2,dz;
-        double thickness;
-
-        /*recover parameters: */
-        inputs->GetParameterValue(&onbed,NodeOnBedEnum);
-        inputs->GetParameterValue(&onsurface,NodeOnSurfaceEnum);
-
-        /*Are we on the base, not on the surface, and not on a clone node?:*/
-        
-        if(onbed==1 & indexing.clone==0 & onsurface==0){
-                        
-                vertexdof=this->GetVertexDof();
-
-                /*this node is on the bed. We are going to, follow the upper nodes until we reach the surface. At each upper node, 
-                 * we'll grab the * field for this node, and add it to overall field: */
-
-                if(strcmp(fieldname,"velocity")==0){
-
-                        /*field is a velocity, 2 dofs per node: */
-                        double velocity2[2];
-                        double velocity1[2];
-                        double velocity_average[2];
-                        double sum[2];
-
-                        sum[0]=0;
-                        sum[1]=0;
-                        thickness=0;
-
-                        /*get dofs for this base node velocity: we know there are two dofs in field_serial */
-                        dofx=2*vertexdof;
-                        dofy=2*vertexdof+1;
-
-                        node=this;
-                        for(;;){
-
-                                if (node->IsOnSurface())break;
-
-                                vertexdof=node->GetVertexDof();
-                                
-                                velocity1[0]=field_serial[2*vertexdof];
-                                velocity1[1]=field_serial[2*vertexdof+1];
-                                z1=node->GetZ();
-
-                                upper_node=node->GetUpperNode();
-                                vertexdof=upper_node->GetVertexDof();
-                        
-                                velocity2[0]=field_serial[2*vertexdof];
-                                velocity2[1]=field_serial[2*vertexdof+1];
-                                z2=upper_node->GetZ();
-
-                                dz=(z2-z1);
-                                thickness+=dz;
-                                velocity_average[0]=(velocity1[0]+velocity2[0])/2.0;
-                                velocity_average[1]=(velocity1[1]+velocity2[1])/2.0;
-
-                                sum[0]+=velocity_average[0]*dz;
-                                sum[1]+=velocity_average[1]*dz;
-
-                                /* get next node: */
-                                node=node->GetUpperNode();
-                        }
-
-                        sum[0]=sum[0]/thickness;
-                        sum[1]=sum[1]/thickness;
-
-                        /* Plfield velocity_average*deltaH/H into base of field: */
-                        VecSetValues(field,1,&dofx,&sum[0],INSERT_VALUES);
-                        VecSetValues(field,1,&dofy,&sum[1],INSERT_VALUES);
-                }
-                else{
-                        /*field is regular, 1 dof per node: */
-                        double field2;
-                        double field1;
-                        double field_average;
-                        double sum;
-
-                        sum=0;
-                        thickness=0;
-
-                        /*get dofs for this base node velocity: we know there are two dofs in field_serial */
-                        dofx=vertexdof;
-
-                        node=this;
-                        for(;;){
-
-                                if (node->IsOnSurface()) break;
-
-                                vertexdof=node->GetVertexDof();
-                                
-                                field1=field_serial[vertexdof];
-                                z1=node->GetZ();
-
-                                upper_node=node->GetUpperNode();
-                                vertexdof=upper_node->GetVertexDof();
-                        
-                                field2=field_serial[vertexdof];
-                                z2=upper_node->GetZ();
-
-                                dz=(z2-z1);
-                                thickness+=dz;
-                                field_average=(field1+field2)/2.0;
-
-                                sum+=field_average*dz;
-
-                                /* get next node: */
-                                node=node->GetUpperNode();
-                        }
-
-                        sum=sum/thickness;
-
-                        /* Plug field_average*deltH/H into base of field: */
-                        VecSetValues(field,1,&dofx,&sum,INSERT_VALUES);
-                }
-        }
-}
-/*}}}*/
 /*FUNCTION Node::VecExtrude {{{1*/
 void  Node::VecExtrude(Vec vector,double* vector_serial){

issm/trunk/src/c/objects/Node.h

@@ -88 +88 @@
                 int   IsOnSurface();
                 void  FreezeDof(int dof);
-                void  FieldAverageOntoVertices(Vec fieldsum,Vec connectivity,double* field);
-                void  FieldDepthAverageAtBase(Vec field,double* field_serial,char* fieldname);
                 int   IsOnShelf();
                 int   IsOnSheet();