[cig-commits] r13435 - in long/3D/Gale/trunk: . src/StgFEM/SLE/SystemSetup/src
walter at geodynamics.org
walter at geodynamics.org
Tue Dec 2 00:53:13 PST 2008
Author: walter
Date: 2008-12-02 00:53:13 -0800 (Tue, 02 Dec 2008)
New Revision: 13435
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
Log:
r2388 at dante: boo | 2008-12-01 23:14:58 -0800
Remove nodal pressures from SystemLinearEquations
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2386
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2388
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c 2008-12-02 00:12:17 UTC (rev 13434)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c 2008-12-02 08:53:13 UTC (rev 13435)
@@ -644,43 +644,6 @@
}
}
-void update_nodal_pressure(void *_context)
-{
- FeVariable *nodal_pressure, *pressure;
- nodal_pressure = (FeVariable*)FieldVariable_Register_GetByName( ((FiniteElementContext *)_context)->fieldVariable_Register, "NodalPressureField" );
- pressure = (FeVariable*)FieldVariable_Register_GetByName( ((FiniteElementContext *)_context)->fieldVariable_Register, "PressureField" );
-
- if(nodal_pressure!=NULL)
- {
- Node_LocalIndex n_i;
- unsigned N, nDims;
-
- FeVariable_SyncShadowValues(pressure);
- nDims = Mesh_GetDimSize( nodal_pressure->feMesh );
-
- /* Average the pressure over neighboring cells to get the
- pressure at the node. */
- N = FeMesh_GetNodeLocalSize( nodal_pressure->feMesh);
- for( n_i = 0; n_i < N; n_i++ ) {
- unsigned nInc;
- unsigned *inc;
- unsigned nn;
- double p,temp;
-
- Mesh_GetIncidence(nodal_pressure->feMesh, MT_VERTEX, n_i, nDims, &nInc, &inc);
- p=0;
- for(nn=0; nn<nInc; ++nn)
- {
- FeVariable_GetValueAtNode(pressure,inc[nn],&temp);
- p+=temp;
- }
- p/=nInc;
- FeVariable_SetValueAtNode(nodal_pressure,n_i,&p);
- }
- FeVariable_SyncShadowValues(nodal_pressure);
- }
-}
-
void SystemLinearEquations_NonLinearExecute( void* sle, void* _context ) {
SystemLinearEquations* self = (SystemLinearEquations*) sle;
Vector* previousVector = NULL;
@@ -722,8 +685,6 @@
currentVector =
SystemLinearEquations_GetSolutionVectorAt( self, 0 )->vector;
- update_nodal_pressure(_context);
-
/* Non linear iterations */
converged=0;
for ( self->nonLinearIteration_I = 1 ;
@@ -746,8 +707,6 @@
self->linearExecute( self, _context );
self->hasExecuted = True;
- update_nodal_pressure(_context);
-
/* TODO - Give option which solution vector to test */
currentVector =
SystemLinearEquations_GetSolutionVectorAt( self, 0 )->vector;
More information about the CIG-COMMITS
mailing list