[cig-commits] r5595 - in long/3D/Gale/trunk: . src/Gale/src
src/PICellerator/MaterialPoints/src src/PICellerator/Weights/src
src/PICellerator/plugins/Application
src/StGermain/Base/Automation/src src/StGermain/Base/Context/src
src/StGermain/Base/Extensibility/src src/StGermain/Base/IO/src
src/StGermain/Discretisation/Geometry/src
src/StGermain/Discretisation/Shape/src
src/StGermain/Discretisation/Swarm/src
src/StGermain/Discretisation/Utils/src
src/StGermain/libStGermain/src src/StGermain/src
src/StgFEM/Assembly/src src/StgFEM/Discretisation/src
src/StgFEM/SLE/LinearAlgebra/PETSc src/StgFEM/SLE/MultiGrid/src
src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src
src/StgFEM/SLE/ProvidedSystems/StokesFlow/src
src/StgFEM/SLE/SystemSetup/src src/StgFEM/plugins/Application
src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution
src/StgFEM/plugins/LevelSetPlugin
src/StgFEM/plugins/StandardConditionFunctions
src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA
src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solB
src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA
src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solD
src/StgFEM/src src/Underworld/Rheology/src
src/Underworld/plugins/Application src/Underworld/plugins/MovingMesh
src/Underworld/plugins/MovingMeshEnergyCorrection
src/Underworld/plugins/Output/AverageTemperature
src/Underworld/plugins/Output/ConvectionData
src/Underworld/plugins/Output/CylinderNodeProfiling
src/Underworld/plugins/Output/Nusselt_deltaT
src/Underworld/plugins/Output/Shfl src/Underworld/src
walter at geodynamics.org
walter at geodynamics.org
Tue Dec 12 12:22:26 PST 2006
Author: walter
Date: 2006-12-12 12:22:21 -0800 (Tue, 12 Dec 2006)
New Revision: 5595
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/Gale/src/main.c
long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/Context.c
long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/Materials_Register.c
long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/SwarmAdvector.c
long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c
long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.h
long/3D/Gale/trunk/src/PICellerator/Weights/src/WeightsCalculator.c
long/3D/Gale/trunk/src/PICellerator/plugins/Application/Application.c
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/LiveComponentRegister.c
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Stg_ComponentFactory.c
long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Stg_ComponentMeta.c
long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
long/3D/Gale/trunk/src/StGermain/Base/Context/src/DictionaryCheck.c
long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c
long/3D/Gale/trunk/src/StGermain/Base/IO/src/Dictionary.c
long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c
long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexVectorMath.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/FullTensorMath.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmVariable.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/TriSingleCellLayout.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Operator.c
long/3D/Gale/trunk/src/StGermain/libStGermain/src/StGermain.h
long/3D/Gale/trunk/src/StGermain/src/main.c
long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.c
long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Matrix.c
long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.c
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.c
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c
long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.c
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.c
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.c
long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c
long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c
long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.c
long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solB/solB.c
long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.c
long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solD/solD.c
long/3D/Gale/trunk/src/StgFEM/src/main.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/Arrhenius.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/Byerlee.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/Director.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/FrankKamenetskii.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/NonNewtonian.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/Orthotropic.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/OrthotropicAligned.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/RheologyMaterial.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/StoreStress.c
long/3D/Gale/trunk/src/Underworld/Rheology/src/VonMises.c
long/3D/Gale/trunk/src/Underworld/plugins/Application/Application.c
long/3D/Gale/trunk/src/Underworld/plugins/MovingMesh/MovingMesh.c
long/3D/Gale/trunk/src/Underworld/plugins/MovingMeshEnergyCorrection/MovingMeshEnergyCorrection.c
long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/AverageTemperature.c
long/3D/Gale/trunk/src/Underworld/plugins/Output/ConvectionData/ConvectionData.c
long/3D/Gale/trunk/src/Underworld/plugins/Output/CylinderNodeProfiling/CylinderNodeProfiling.c
long/3D/Gale/trunk/src/Underworld/plugins/Output/Nusselt_deltaT/Nusselt_deltaT.c
long/3D/Gale/trunk/src/Underworld/plugins/Output/Shfl/Shfl.c
long/3D/Gale/trunk/src/Underworld/src/main.c
Log:
r1238 at earth: boo | 2006-12-12 12:22:49 -0800
Fix a whole lot of C++ style comments
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1237
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1238
Modified: long/3D/Gale/trunk/src/Gale/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/src/main.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Gale/src/main.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -187,7 +187,7 @@
Stg_Class_Delete( context );
Stg_Class_Delete( dictionary );
- //if( rank == procToWatch ) Memory_Print();
+ /*if( rank == procToWatch ) Memory_Print(); */
#ifdef HAVE_PYTHON
Py_Finalize();
Modified: long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/Context.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/Context.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/Context.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -170,9 +170,9 @@
ContextEP_Prepend( self, AbstractContext_EP_ConstructExtensions, PICelleratorContext_CreateDefaultMaterial );
- // TODO want to append an EP to the end of the time integration that makes sure that after all integration
- // swarms have been updated, each element has at least one integration point from one swarm in it, or else
- // we will fail the next timestep
+/* TODO want to append an EP to the end of the time integration that makes sure that after all integration */
+/* swarms have been updated, each element has at least one integration point from one swarm in it, or else */
+/* we will fail the next timestep */
}
Modified: long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/Materials_Register.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/Materials_Register.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/Materials_Register.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -99,7 +99,7 @@
assert( swarm != NULL );
_Materials_Register_LayoutGeometry( self, swarm );
- //Materials_Register_SetupParticleToMaterialMappings( self, swarm );
+/* Materials_Register_SetupParticleToMaterialMappings( self, swarm ); */
Materials_Register_AssignParticleProperties( self, swarm, swarm->swarmVariable_Register->variable_Register );
}
@@ -189,8 +189,8 @@
if ( /*(swarm->myRank == 0) && */ ((lParticle_I+1) >= nextCompletedParticleCountToPrint ) ) {
- // TODO: parallelise : non-master CPUs send a non-blocking update to the master to report
- // status. Master does blocking receive on all updates before printing
+/* TODO: parallelise : non-master CPUs send a non-blocking update to the master to report */
+/* status. Master does blocking receive on all updates before printing */
/* Special case for really small swarms, or really small increments - may cross more than one
at once */
Modified: long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/SwarmAdvector.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/SwarmAdvector.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/PICellerator/MaterialPoints/src/SwarmAdvector.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -133,7 +133,7 @@
MaterialPointsSwarm* swarm,
PeriodicBoundariesManager* periodicBCsManager )
{
- // TODO - commented out by Pat Sunter 20060428 since we need to use gauss layout initially for testing sometimes
+/* TODO - commented out by Pat Sunter 20060428 since we need to use gauss layout initially for testing sometimes */
/*
Journal_Firewall(
swarm->particleLayout->coordSystem == GlobalCoordSystem,
Modified: long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -243,7 +243,7 @@
pList[ cells[i].p ].cx += cells[i].x;
pList[ cells[i].p ].cy += cells[i].y;
pList[ cells[i].p ].cz += cells[i].z;
- count[ cells[i].p ]++;//for total volume of a cell
+ count[ cells[i].p ]++;/* for total volume of a cell */
}
for(i=0;i<nump;i++){
pList[ i ].w = count[i]*vol;
@@ -270,7 +270,7 @@
for(i=0;i<n*m;i++){
pList[ cells[i].p ].cx += cells[i].x;
pList[ cells[i].p ].cy += cells[i].y;
- count[ cells[i].p ]++;//for total volume of a cell
+ count[ cells[i].p ]++;/* for total volume of a cell */
}
for(i=0;i<nump;i++){
pList[ i ].w = count[i]*vol;
@@ -295,8 +295,8 @@
for(i=0;i<bchain->sizeofboundary;i++){
- cell_num0 = bchain->new_bound_cells[i];// cell number we are trying to claim
- if(cells[cell_num0].p == -1){//if cell unowned then claim cell
+ cell_num0 = bchain->new_bound_cells[i];/* cell number we are trying to claim */
+ if(cells[cell_num0].p == -1){/* if cell unowned then claim cell */
/* This is the bit needed for mallocing */
/* do a test here to see if we need to realloc bchain->new_claimed_cells and bchain->new_bound_cells */
if( count > bchain->new_claimed_cells_malloced - 1 ){
@@ -311,11 +311,11 @@
bchain->new_claimed_cells[count] = cell_num0;
bchain->numclaimed++;
count++;
- cells[cell_num0].p = p_i;// this cell is now owned by particle p_i
+ cells[cell_num0].p = p_i;/* this cell is now owned by particle p_i */
}
else{
if(cells[cell_num0].p != p_i){
- //we need a contest between particles for the cell.
+/* we need a contest between particles for the cell. */
x2 = (*pList)[p_i].x;
y2 = (*pList)[p_i].y;
z2 = (*pList)[p_i].z;
@@ -332,12 +332,12 @@
bchain->new_claimed_cells[count] = cell_num0;
bchain->numclaimed++;
count++;
- cells[cell_num0].p = p_i;// this cell is now owned by particle p_i
+ cells[cell_num0].p = p_i;/* this cell is now owned by particle p_i */
}
- }//if
- }//else
+ }/* if */
+ }/* else */
}
- bchain->new_claimed_cells[count] = -1;// end of list
+ bchain->new_claimed_cells[count] = -1;/* end of list */
}
void claim_cells2d(struct chain **bbchain,struct cell2d **ccells,struct particle2d **pList,int p_i){
@@ -353,8 +353,8 @@
for(i=0;i<bchain->sizeofboundary;i++){
- cell_num0 = bchain->new_bound_cells[i];// cell number we are trying to claim
- if(cells[cell_num0].p == -1){//if cell unowned then claim cell
+ cell_num0 = bchain->new_bound_cells[i];/* cell number we are trying to claim */
+ if(cells[cell_num0].p == -1){/* if cell unowned then claim cell */
/* This is the bit needed for mallocing */
/* do a test here to see if we need to realloc bchain->new_claimed_cells and bchain->new_bound_cells */
if( count > bchain->new_claimed_cells_malloced - 1 ){
@@ -369,11 +369,11 @@
bchain->new_claimed_cells[count] = cell_num0;
bchain->numclaimed++;
count++;
- cells[cell_num0].p = p_i;// this cell is now owned by particle p_i
+ cells[cell_num0].p = p_i;/* this cell is now owned by particle p_i */
}
else{
if(cells[cell_num0].p != p_i){
- //we need a contest between particles for the cell.
+/* we need a contest between particles for the cell. */
x2 = (*pList)[p_i].x;
y2 = (*pList)[p_i].y;
x1 = (*pList)[cells[cell_num0].p].x;
@@ -387,12 +387,12 @@
bchain->new_claimed_cells[count] = cell_num0;
bchain->numclaimed++;
count++;
- cells[cell_num0].p = p_i;// this cell is now owned by particle p_i
+ cells[cell_num0].p = p_i;/* this cell is now owned by particle p_i */
}
- }//if
- }//else
+ }/* if */
+ }/* else */
}
- bchain->new_claimed_cells[count] = -1;// end of list
+ bchain->new_claimed_cells[count] = -1;/* end of list */
}
@@ -433,9 +433,9 @@
for(k=0;k<6;k++){
cell_num1 = cell_num[k];
- // if cell does not already belong to the particle and hasn't been
- // marked as being done then add it to new boundary array and mark it
- // as done
+/* if cell does not already belong to the particle and hasn't been */
+/* marked as being done then add it to new boundary array and mark it */
+/* as done */
if(cell_num1 != -2){
if(cells[cell_num1].p != p_i && cells[cell_num1].done != 1){
/* This is the bit needed for mallocing */
@@ -453,11 +453,11 @@
bchain->sizeofboundary++;
count++;
cells[cell_num1].done = 1;
- }//if
- }//if cell_num1
- }//for k
- }//for
- // reset the done flags back to zero for next time
+ }/* if */
+ }/* if cell_num1 */
+ }/* for k */
+ }/* for */
+/* reset the done flags back to zero for next time */
for(i=0;i<count;i++){
cells[ bchain->new_bound_cells[i] ].done = 0;
}
@@ -482,9 +482,9 @@
for(k=0;k<4;k++){
cell_num1 = cell_num[k];
- // if cell does not already belong to the particle and hasn't been
- // marked as being done then add it to new boundary array and mark it
- // as done
+/* if cell does not already belong to the particle and hasn't been */
+/* marked as being done then add it to new boundary array and mark it */
+/* as done */
if(cell_num1 != -2){
if(cells[cell_num1].p != p_i && cells[cell_num1].done != 1){
/* This is the bit needed for mallocing */
@@ -502,11 +502,11 @@
bchain->sizeofboundary++;
count++;
cells[cell_num1].done = 1;
- }//if
- }//if cell_num1
- }//for k
- }//for
- // reset the done flags back to zero for next time
+ }/* if */
+ }/* if cell_num1 */
+ }/* for k */
+ }/* for */
+/* reset the done flags back to zero for next time */
for(i=0;i<count;i++){
cells[ bchain->new_bound_cells[i] ].done = 0;
}
@@ -564,9 +564,9 @@
cells[i+l*j+k*l*m].E = i+l*j+1+k*l*m;
cells[i+l*j+1+k*l*m].W = i+l*j+k*l*m;
}
- }//x
- }//y
- }//z
+ }/* x */
+ }/* y */
+ }/* z */
*cell_list = cells;
}
@@ -622,12 +622,12 @@
void init_structs( struct chain **bchain, struct particle **pList, int nump){
int i;
- // init the data structures
+/* init the data structures */
if( (*bchain = (struct chain *)malloc( nump*sizeof(struct chain ) )) == 0){
printf("No memory for bchain\nCannot continue.\n");
exit(1);
}
- // note that doing bchain[i]->new... doesn't work
+/* note that doing bchain[i]->new... doesn't work */
for(i=0;i<nump;i++){
(*bchain)[i].new_claimed_cells = (int *)malloc(INC*sizeof(int));
(*bchain)[i].new_claimed_cells_malloced = INC;
@@ -644,12 +644,12 @@
void init_structs2d( struct chain **bchain, struct particle2d **pList, int nump){
int i;
- // init the data structures
+/* init the data structures */
if( (*bchain = (struct chain *)malloc( nump*sizeof(struct chain ) )) == 0){
printf("No memory for bchain\nCannot continue.\n");
exit(1);
}
- //
+
for(i=0;i<nump;i++){
(*bchain)[i].new_claimed_cells = (int *)malloc(INC*sizeof(int));
(*bchain)[i].new_claimed_cells_malloced = INC;
@@ -683,19 +683,19 @@
k = ((*pList)[i].x - BBXMIN)/dx;
j = ((*pList)[i].y - BBYMIN)/dy;
l = ((*pList)[i].z - BBZMIN)/dz;
- (*cells)[k+j*numx+l*numx*numy].p = i; //particle number i
- (*bchain)[i].numclaimed = 1;// number of most recently claimed cells
+ (*cells)[k+j*numx+l*numx*numy].p = i; /* particle number i */
+ (*bchain)[i].numclaimed = 1;/* number of most recently claimed cells */
(*bchain)[i].sizeofboundary = 0;
- (*bchain)[i].totalclaimed = 1;// total of claimed cells so far.
+ (*bchain)[i].totalclaimed = 1;/* total of claimed cells so far. */
(*bchain)[i].done = 0;
- (*bchain)[i].index = k+j*numx+l*numx*numy;// ith particle is in cell # k+j*numx
+ (*bchain)[i].index = k+j*numx+l*numx*numy;/* ith particle is in cell # k+j*numx */
(*bchain)[i].new_claimed_cells[0] = k+j*numx+l*numx*numy;
- // ith particle has just claimed cell number k+j*numx+l*numx*numy
- (*bchain)[i].new_claimed_cells[1] = -1;// denotes end of claimed_cells list
- // when we have finished claiming cells we call this function.
+/* ith particle has just claimed cell number k+j*numx+l*numx*numy */
+ (*bchain)[i].new_claimed_cells[1] = -1;/* denotes end of claimed_cells list */
+/* when we have finished claiming cells we call this function. */
update_bchain(bchain,cells,i);
}
- count = i;// number of particles
+ count = i;/* number of particles */
claimed = 1;
while(claimed != 0){
@@ -705,7 +705,7 @@
claimed += (*bchain)[i].numclaimed;
update_bchain(bchain,cells,i);
}
- }//while
+ }/* while */
}
/********************************************************************
@@ -726,18 +726,18 @@
k = ((*pList)[i].x - BBXMIN)/dx;
j = ((*pList)[i].y - BBYMIN)/dy;
- (*cells)[k+j*numx].p = i; //particle number i
+ (*cells)[k+j*numx].p = i; /* particle number i */
- (*bchain)[i].numclaimed = 1;// number of most recently claimed cells
+ (*bchain)[i].numclaimed = 1;/* number of most recently claimed cells */
(*bchain)[i].sizeofboundary = 0;
- (*bchain)[i].totalclaimed = 1;// total of claimed cells so far.
+ (*bchain)[i].totalclaimed = 1;/* total of claimed cells so far. */
(*bchain)[i].done = 0;
- (*bchain)[i].index = k+j*numx;// ith particle is in cell # k+j*numx
- (*bchain)[i].new_claimed_cells[0] = k+j*numx; // ith particle has just claimed cell number k+j*numx
- (*bchain)[i].new_claimed_cells[1] = -1;// denotes end of claimed_cells list
- // when we have finished claiming cells we call this function.
+ (*bchain)[i].index = k+j*numx;/* ith particle is in cell # k+j*numx */
+ (*bchain)[i].new_claimed_cells[0] = k+j*numx; /* ith particle has just claimed cell number k+j*numx */
+ (*bchain)[i].new_claimed_cells[1] = -1;/* denotes end of claimed_cells list */
+/* when we have finished claiming cells we call this function. */
update_bchain2d( bchain, cells, i);
- }//nump
+ }/* nump */
claimed = 1;
@@ -748,7 +748,7 @@
claimed += (*bchain)[i].numclaimed;
update_bchain2d( bchain, cells, i);
}
- }//while
+ }/* while */
}
void _DVCWeights_Calculate3D( void* dvcWeights, void* _swarm, Cell_LocalIndex lCell_I ) {
DVCWeights* self = (DVCWeights*) dvcWeights;
@@ -757,11 +757,11 @@
IntegrationPoint** particle;
static int visited = 0 ;
double dx,dy,dz,da;
- static struct cell *cells;// the connected grid
- struct particle *pList;// particle List
- struct chain *bchain;//boundary chain
+ static struct cell *cells;/* the connected grid */
+ struct particle *pList;/* particle List */
+ struct chain *bchain;/* boundary chain */
int nump,numx,numy,numz;
- double BBXMIN = -1.0; // the ranges of the local coordinates of a FEM cell.
+ double BBXMIN = -1.0; /* the ranges of the local coordinates of a FEM cell. */
double BBXMAX = 1.0;
double BBYMIN = -1.0;
double BBYMAX = 1.0;
@@ -782,11 +782,11 @@
dz = (BBZMAX - BBZMIN)/numz;
da = dx*dy*dz;
- // Construct the grid for the Voronoi cells only once.
- // If we wanted to call this function again during a job with a different resolution
- // then we should destroy the grid once we have looped through the whole mesh.
- // I am assuming we are not going to do that for now.
- // Easy to implement this anyway, if needed.
+/* Construct the grid for the Voronoi cells only once. */
+/* If we wanted to call this function again during a job with a different resolution */
+/* then we should destroy the grid once we have looped through the whole mesh. */
+/* I am assuming we are not going to do that for now. */
+/* Easy to implement this anyway, if needed. */
if(!visited){
/* The DVCWeights class should really be a class the next level up here */
/* We should be able to swap out the WeightsCalculator_CalculateAll instead of just setting
@@ -796,15 +796,15 @@
}
- // init the data structures
+/* init the data structures */
init_structs( &bchain, &pList, nump);
reset_grid(&cells,numz*numy*numx);
particle = (IntegrationPoint**)malloc(nump*sizeof(IntegrationPoint*));
- // initialize the particle positions to be the local coordinates of the material swarm particles
- // I am assuming the xi's (local coords) are precalculated somewhere and get reset based on material
- // positions each time step.
+/* initialize the particle positions to be the local coordinates of the material swarm particles */
+/* I am assuming the xi's (local coords) are precalculated somewhere and get reset based on material */
+/* positions each time step. */
for(i=0;i<nump;i++){
particle[i] = (IntegrationPoint*) Swarm_ParticleInCellAt( swarm, lCell_I, i );
@@ -815,8 +815,8 @@
}
create_voronoi( &bchain, &pList, &cells, dx, dy, dz, nump, numx, numy, numz, BBXMIN, BBXMAX, BBYMIN, BBYMAX, BBZMIN, BBZMAX);
get_centroids( cells, pList,numz,numy,numx,nump,da);
- // We are setting the integration points to be the centroids of the Voronoi regions here and
- // the weight is the volume of each Voronoi region.
+/* We are setting the integration points to be the centroids of the Voronoi regions here and */
+/* the weight is the volume of each Voronoi region. */
for(i=0;i<nump;i++){
particle[i]->xi[0] = pList[i].cx;
@@ -841,11 +841,11 @@
IntegrationPoint** particle;
static int visited = 0 ;
double dx,dy,da;
- static struct cell2d *cells;// the connected grid
- struct particle2d *pList;// particle List
- struct chain *bchain;//boundary chain
+ static struct cell2d *cells;/* the connected grid */
+ struct particle2d *pList;/* particle List */
+ struct chain *bchain;/* boundary chain */
int nump,numx,numy;
- double BBXMIN = -1.0; // the ranges of the local coordinates of a FEM cell.
+ double BBXMIN = -1.0; /* the ranges of the local coordinates of a FEM cell. */
double BBXMAX = 1.0;
double BBYMIN = -1.0;
double BBYMAX = 1.0;
@@ -862,11 +862,11 @@
dy = (BBYMAX - BBYMIN)/numy;
da = dx*dy;
- // Construct the grid for the Voronoi cells only once.
- // If we wanted to call this function again during a job with a different resolution
- // then we should destroy the grid once we have looped through the whole mesh.
- // I am assuming we are not going to do that for now.
- // Easy to implement this anyway, if needed.
+/* Construct the grid for the Voronoi cells only once. */
+/* If we wanted to call this function again during a job with a different resolution */
+/* then we should destroy the grid once we have looped through the whole mesh. */
+/* I am assuming we are not going to do that for now. */
+/* Easy to implement this anyway, if needed. */
if(!visited){
/* The DVCWeights class should really be a class the next level up here */
/* We should be able to swap out the WeightsCalculator_CalculateAll instead of just setting
@@ -876,15 +876,15 @@
}
- // init the data structures
+/* init the data structures */
init_structs2d( &bchain, &pList, nump);
reset_grid2d(&cells,numy*numx);
particle = (IntegrationPoint**)malloc(nump*sizeof(IntegrationPoint*));
- // initialize the particle positions to be the local coordinates of the material swarm particles
- // I am assuming the xi's (local coords) are precalculated somewhere and get reset based on material
- // positions each time step.
+/* initialize the particle positions to be the local coordinates of the material swarm particles */
+/* I am assuming the xi's (local coords) are precalculated somewhere and get reset based on material */
+/* positions each time step. */
for(i=0;i<nump;i++){
particle[i] = (IntegrationPoint*) Swarm_ParticleInCellAt( swarm, lCell_I, i );
@@ -894,8 +894,8 @@
}
create_voronoi2d( &bchain, &pList, &cells, dx, dy, nump, numx, numy, BBXMIN, BBXMAX, BBYMIN, BBYMAX);
get_centroids2d( cells, pList,numy,numx,nump,da);
- // We are setting the integration points to be the centroids of the Voronoi regions here and
- // the weight is the volume of each Voronoi region.
+/* We are setting the integration points to be the centroids of the Voronoi regions here and */
+/* the weight is the volume of each Voronoi region. */
for(i=0;i<nump;i++){
particle[i]->xi[0] = pList[i].cx;
Modified: long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.h
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.h 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.h 2006-12-12 20:22:21 UTC (rev 5595)
@@ -72,7 +72,7 @@
#define INC 50
struct cell{
- int p;//particle index number
+ int p;/*particle index number */
int index;
int N;
int S;
@@ -86,7 +86,7 @@
int done;
};
struct cell2d{
- int p;//particle index number
+ int p;/*particle index number*/
int index;
int N;
int S;
@@ -97,9 +97,9 @@
int done;
};
struct chain{
- int p;//particle index number
- int index;//cell number in grid
- int sizeofboundary; // number of cells on boundary so far
+ int p;/*particle index number*/
+ int index;/*cell number in grid*/
+ int sizeofboundary; /* number of cells on boundary so far*/
int numclaimed;
int totalclaimed;
int new_bound_cells_malloced;
@@ -126,7 +126,7 @@
double w;
int index;
};
-// function prototypes
+/* function prototypes*/
void get_centroids( struct cell *cells,struct particle *pList,
int n,int m, int l,int nump,double vol);
void claim_cells(struct chain **bchain,struct cell **cells,struct particle **pList,int p_i);
@@ -163,7 +163,7 @@
void _DVCWeights_Calculate2D( void* dvcWeights, void* _swarm, Cell_LocalIndex lCell_I );
void _DVCWeights_Calculate3D( void* dvcWeights, void* _swarm, Cell_LocalIndex lCell_I );
-// end prototypes
+/* end prototypes*/
/*---------------------------------------------------------------------------------------------------------------------
** Constructors
Modified: long/3D/Gale/trunk/src/PICellerator/Weights/src/WeightsCalculator.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/src/WeightsCalculator.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/src/WeightsCalculator.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -160,19 +160,19 @@
}
void _WeightsCalculator_Build( void* weightsCalculator, void* data ) {
- //WeightsCalculator* self = (WeightsCalculator*)weightsCalculator;
+/* WeightsCalculator* self = (WeightsCalculator*)weightsCalculator; */
}
void _WeightsCalculator_Initialise( void* weightsCalculator, void* data ) {
- //WeightsCalculator* self = (WeightsCalculator*)weightsCalculator;
+/* WeightsCalculator* self = (WeightsCalculator*)weightsCalculator; */
}
void _WeightsCalculator_Execute( void* weightsCalculator, void* data ) {
-// WeightsCalculator* self = (WeightsCalculator*)weightsCalculator;
+/* WeightsCalculator* self = (WeightsCalculator*)weightsCalculator; */
}
void _WeightsCalculator_Destroy( void* weightsCalculator, void* data ) {
- //WeightsCalculator* self = (WeightsCalculator*)weightsCalculator;
+/* WeightsCalculator* self = (WeightsCalculator*)weightsCalculator; */
}
@@ -223,7 +223,7 @@
for ( lCell_I = 0 ; lCell_I < cellLocalCount ; lCell_I++ ) {
/* WeightsCalculator_CheckEmptyCell( self, swarm, lCell_I );*/
WeightsCalculator_CalculateCell( self, swarm, lCell_I );
- // TODO: parallelise
+/* TODO: parallelise */
if ( (lCell_I+1) >= nextCompletedCellCountToPrint ) {
nextPlusOneCompletedCellCountToPrint = ceil(( cellLocalCount
Modified: long/3D/Gale/trunk/src/PICellerator/plugins/Application/Application.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/plugins/Application/Application.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/PICellerator/plugins/Application/Application.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -44,19 +44,19 @@
#endif
#include <mpi.h>
-//EP_APPLICATIONS_FINALISE defined in StGermain.h
+/* EP_APPLICATIONS_FINALISE defined in StGermain.h */
#include <StGermain/StGermain.h>
-//Must include StgFEM library, but WON'T call Stg_FEM_Init in this plugin.
+/* Must include StgFEM library, but WON'T call Stg_FEM_Init in this plugin. */
#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
#include "Application.h"
#include <stdio.h>
-//for strcmp
+/* for strcmp */
#include <string.h>
-//All StGermain Application Plugins should use this finalise.
-//char EP_APPLICATIONS_FINALISE[] = "StGermain_EP_ApplicationsFinalise";
+/* All StGermain Application Plugins should use this finalise. */
+/* char EP_APPLICATIONS_FINALISE[] = "StGermain_EP_ApplicationsFinalise"; */
const Type PICellerator_Application_Type = "PICellerator_Application";
void _PICellerator_Application_Construct( void* component, Stg_ComponentFactory* cf, void* data )
@@ -68,8 +68,8 @@
AbstractContext* prevContext;
EntryPoint* applicationsFinalise_EP;
- //Get the existing abstract context, as defined by StGermain.
- //Get it up here, so the communicator can be used for messages.
+/* Get the existing abstract context, as defined by StGermain. */
+/* Get it up here, so the communicator can be used for messages. */
prevContext = (AbstractContext*)Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
/* Ensures copyright info always come first in output */
@@ -89,48 +89,48 @@
/* Ensures copyright info always come first in output */
MPI_Barrier( prevContext->communicator );
- //Only need to initialise a new context, and copy all relevant registers over IF this is the first application
- //plugin to be constructed.
- //The first application plugin to be constructed is Guaranteed to have the 'largest' context.
- // (ie is an inherited child of ALL other application plugins about to be loaded)
+/* Only need to initialise a new context, and copy all relevant registers over IF this is the first application */
+/* plugin to be constructed. */
+/* The first application plugin to be constructed is Guaranteed to have the 'largest' context. */
+/* (ie is an inherited child of ALL other application plugins about to be loaded) */
if( prevContext->type == AbstractContext_Type )
{
- //Set the existing abstract context.
+/* Set the existing abstract context. */
currAbstractContext = prevContext;
- //Create a new, empty PICelleratorContext.
+/* Create a new, empty PICelleratorContext. */
context = PICelleratorContext_New( "context", 0, 0, currAbstractContext->communicator, cf->rootDict );
context->dictionary = cf->rootDict;
- //Initialise Abstract parts of PICelleratorContext
+/* Initialise Abstract parts of PICelleratorContext */
_AbstractContext_Init((AbstractContext*)context, 0, 0, MPI_COMM_WORLD );
- //Initialise Discretisation parts of PICelleratorContext
+/* Initialise Discretisation parts of PICelleratorContext */
_DiscretisationContext_Init((DiscretisationContext*)context );
- //Initialise FiniteElement parts of PICelleratorContext
+/* Initialise FiniteElement parts of PICelleratorContext */
_FiniteElementContext_Init( (FiniteElementContext*)context );
- //Initialise PIcellerator parts of PICelleratorContext
+/* Initialise PIcellerator parts of PICelleratorContext */
_PICelleratorContext_Init( context );
- //Need to get the old CF from currAbstractContext, and use that in my new context.
- //Now I CANNOT delete this currAbstractContext or I'll lose the CF. :(
+/* Need to get the old CF from currAbstractContext, and use that in my new context. */
+/* Now I CANNOT delete this currAbstractContext or I'll lose the CF. :( */
context->CF = currAbstractContext->CF;
- //Need to get the LCRegister componentList, and replace the existing (abstract) context
- //with the newly created (PICellerator) context!!!
+/* Need to get the LCRegister componentList, and replace the existing (abstract) context */
+/* with the newly created (PICellerator) context!!! */
Stg_ObjectList_Replace( context->CF->LCRegister->componentList,
((Stg_Component*) currAbstractContext)->name,
KEEP,
(Stg_Component*) context);
- //Recreate the registerRegister link in CF.
+/* Recreate the registerRegister link in CF. */
context->CF->registerRegister = context->register_Register;
- //Create the EntryPoint for all application plugins' finalise functions to hook into.
+/* Create the EntryPoint for all application plugins' finalise functions to hook into. */
applicationsFinalise_EP = EntryPoint_New( EP_APPLICATIONS_FINALISE, EntryPoint_VoidPtr_CastType );
EntryPoint_Register_Add(context->entryPoint_Register, (void*)applicationsFinalise_EP);
- } //close of if(context->type == AbstractContext_Type)
- else //prevContext was NOT an abstract context -> that is does NOT need to be replaced
+ } /* close of if(context->type == AbstractContext_Type) */
+ else /* prevContext was NOT an abstract context -> that is does NOT need to be replaced */
context = (PICelleratorContext*) prevContext;
@@ -164,7 +164,7 @@
Index PICellerator_Application_Register( PluginsManager* pluginsManager )
{
- //Initialise the PICellerator context.
+/* Initialise the PICellerator context. */
PICellerator_Init( NULL, NULL);
#ifdef HAVE_PYTHON
Py_Initialize();
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/CompositeVC.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -318,10 +318,10 @@
vcName = Stg_ComponentFactory_GetString( cf, self->name, "vcName", self->name );
if ( cf->rootDict )
vcDict = Dictionary_GetDictionary( cf->rootDict, vcName );
-// Journal_Firewall(
-// vcDict != NULL,
-// Journal_Register( Error_Type, self->type ),
-// "For %s '%s' - Cannont find variable condition dictionary '%s'\n", self->type, self->name, vcName );
+/* Journal_Firewall( */
+/* vcDict != NULL, */
+/* Journal_Register( Error_Type, self->type ), */
+/* "For %s '%s' - Cannont find variable condition dictionary '%s'\n", self->type, self->name, vcName ); */
initData = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Data", Stg_Component, False, data );
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/LiveComponentRegister.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/LiveComponentRegister.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/LiveComponentRegister.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -108,7 +108,7 @@
assert( self );
- // TODO: add some debug printing about this...
+/* TODO: add some debug printing about this... */
LiveComponentRegister_DeleteAll( self );
Stg_Class_Delete( self->componentList );
@@ -215,7 +215,7 @@
some other components */
for ( index = 0 ; index < LiveComponentRegister_GetCount( self ) ; index++ ) {
component = LiveComponentRegister_At( self, index );
- //printf( "Freeing component \"%s\" (type %s)\n", component->name, component->type );
+/* printf( "Freeing component \"%s\" (type %s)\n", component->name, component->type ); */
Stg_Class_Delete( component );
}
self->componentList->count = 0;
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Stg_ComponentFactory.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Stg_ComponentFactory.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Stg_ComponentFactory.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -418,7 +418,7 @@
retVal = Dictionary_Entry_Value_AsUnsignedInt(
_Stg_ComponentFactory_GetNumericalValue( cf, componentName, key,
Dictionary_Entry_Value_FromUnsignedInt( defaultVal )));
- // TODO : Possible memory leak if defaultVal not added to the dictionary
+/* TODO : Possible memory leak if defaultVal not added to the dictionary */
return retVal;
}
Bool Stg_ComponentFactory_GetBool( void* cf, Name componentName, Dictionary_Entry_Key key, Bool defaultVal ) {
Modified: long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Stg_ComponentMeta.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Stg_ComponentMeta.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Base/Automation/src/Stg_ComponentMeta.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -58,7 +58,7 @@
Stg_ComponentMeta_Value_Type,
_Stg_ComponentMeta_Value_Delete,
NULL,
- _Stg_ComponentMeta_Value_Copy,//NULL,
+ _Stg_ComponentMeta_Value_Copy,/*NULL, */
name,
NON_GLOBAL );
self->metaType = metaType;
Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -281,7 +281,7 @@
self->gracefulQuit = False;
- // TODO: does this need to be read from checkpoint file???
+ /* TODO: does this need to be read from checkpoint file??? */
self->currentTime = self->startTime;
self->timeStep = 0;
self->timeStepSinceJobRestart = 0;
@@ -515,7 +515,7 @@
context... need to "re-self" this EP. */
context = *ptrToContext;
self = KeyHandle( context, context->constructK );
-//context->entryPoint_Register
+ /*context->entryPoint_Register */
}
#ifdef USE_PROFILE
Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/src/DictionaryCheck.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/src/DictionaryCheck.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/src/DictionaryCheck.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -74,10 +74,10 @@
dictionary->entryPtr[index_J]->key)) )
{
- //preserve indexes index_I, index_J
+/* preserve indexes index_I, index_J */
keyIndexArray[errCount][0] = index_I;
keyIndexArray[errCount][1] = index_J;
- //increment counter
+/* increment counter */
errCount++;
}
@@ -100,7 +100,7 @@
Journal_Printf(errStream, "\"%s\"\n",
dictionary->entryPtr[keyIndexArray[errIndex][1]]->key );
}
- //Do I need this one here if Journal_Firewall exits prog?
+/* Do I need this one here if Journal_Firewall exits prog? */
Stream_UnIndent(errStream);
Journal_Firewall(errCount == 0, errStream,
"Error in %s with %d entries in dictionary keys\n",
Modified: long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -434,7 +434,7 @@
int i;
for ( i = 0; i < self->codelets->count; ++i ) {
- Stg_Component_Construct( self->codelets->data[i], cf, data, False );// True );
+ Stg_Component_Construct( self->codelets->data[i], cf, data, False );/* True ); */
}
}
@@ -442,7 +442,7 @@
Bool PluginsManager_ConstructPlugin( void* plugins, Name pluginName, Stg_ComponentFactory* cf, void* data ) {
PluginsManager* self = (PluginsManager*)plugins;
- //Get the codelet for the plugin we're wanting to construct.
+ /*Get the codelet for the plugin we're wanting to construct. */
void* codelet = Stg_ObjectList_Get(self->codelets, pluginName);
if(codelet == NULL)
Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/Dictionary.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/Dictionary.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/Dictionary.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -225,7 +225,7 @@
Dictionary_Entry* Dictionary_GetEntryByIndex( void* dictionary, Dictionary_Index index) {
Dictionary* self = dictionary;
- // Check that self->entryPtr[index] is NOT NULL
+ /* Check that self->entryPtr[index] is NOT NULL */
if( ! self->entryPtr[index] )
return 0;
else
Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -607,9 +607,9 @@
exit( EXIT_FAILURE );
*/
- // SGI MPI on the ess does not always print out everything before it exits
- // To ensure all output is displayed before the program quits on firewall, sleep for one second
- // Alan & Kath 20061006
+ /* SGI MPI on the ess does not always print out everything before it exits
+ To ensure all output is displayed before the program quits on firewall, sleep for one second
+ Alan & Kath 20061006 */
#ifndef NO_UNISTD
sleep( 1 );
#endif
Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -468,9 +468,9 @@
/* 1. Current directory */
{
- // $PWD does not work for all ranks, in all mpi implementations
- // "./" however does so far.
- // char* pwd = getenv( "PWD" );
+ /* $PWD does not work for all ranks, in all mpi implementations
+ "./" however does so far.
+ char* pwd = getenv( "PWD" ); */
char* pwd = "./";
if ( pwd != NULL ) {
_XML_IO_Handler_AddSearchPath( self, pwd );
@@ -1634,7 +1634,7 @@
/* Memory_Free memory */
xmlFreeDoc( self->currDoc );
- //xmlCleanupParser();
+ /*xmlCleanupParser(); */
/* TODO if updating, xmlCleanupParser(); */
self->currDoc = NULL;
self->currNameSpace = NULL;
@@ -1674,7 +1674,7 @@
assert( filename );
assert( name );
assert( value );
- //Do not assert source -> it may well be NULL.
+ /*Do not assert source -> it may well be NULL.*/
#endif
Journal_Printf(stream, "_XML_IO_Handler_WriteEntryToFile called to write dictionary entry %s to file %s.\n", name, filename );
/* if overwrite/new */
@@ -1714,7 +1714,7 @@
}
xmlFreeDoc( self->currDoc );
- //xmlCleanupParser();
+ /*xmlCleanupParser();*/
/* TODO if updating, xmlCleanupParser(); */
self->currDoc = NULL;
self->currNameSpace = NULL;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexVectorMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexVectorMath.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/ComplexVectorMath.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -205,7 +205,7 @@
void StGermain_RotateComplexVector(Cmplx* vector, double alpha, double beta,
double gama, Cmplx* rotatedVector) {
double rotationMatrix[3][3]; /* Indicies [Column][Row][Real or Imag] */
- //double e0, e1, e2, e3;
+ /*double e0, e1, e2, e3; */
Cmplx r_0, r_1, r_2, tmp ;
@@ -222,7 +222,7 @@
rotationMatrix[2][2] = cos(alpha) * cos(beta);
- // x direction
+ /* x direction */
Cmplx_RealMultiply(vector[0], rotationMatrix[0][0], r_0);
Cmplx_RealMultiply(vector[1], rotationMatrix[0][1], r_1);
Cmplx_RealMultiply(vector[2], rotationMatrix[0][2], r_2);
@@ -231,7 +231,7 @@
Cmplx_Add(tmp, r_2, rotatedVector[0]);
- // y direction
+ /* y direction */
Cmplx_RealMultiply(vector[0], rotationMatrix[1][0], r_0);
Cmplx_RealMultiply(vector[1], rotationMatrix[1][1], r_1);
Cmplx_RealMultiply(vector[2], rotationMatrix[1][2], r_2);
@@ -239,7 +239,7 @@
Cmplx_Add(r_0, r_1, tmp);
Cmplx_Add(tmp, r_2, rotatedVector[1]);
- // z direction
+ /* z direction */
Cmplx_RealMultiply(vector[0], rotationMatrix[2][0], r_0);
Cmplx_RealMultiply(vector[1], rotationMatrix[2][1], r_1);
Cmplx_RealMultiply(vector[2], rotationMatrix[2][2], r_2);
@@ -259,7 +259,7 @@
/* Rotation around one axis will always leave the component on that axis alone */
rotatedVector[axis][REAL_PART] = vector[axis][REAL_PART];
rotatedVector[axis][IMAG_PART] = vector[axis][IMAG_PART];
- //printf("axis %d, %2.3f", axis, vector[axis][REAL_PART]);
+ /*printf("axis %d, %2.3f", axis, vector[axis][REAL_PART]); */
switch (axis) {
case K_AXIS: /* Rotate around Z axis */
Cmplx_RealMultiply(vector[0], cos(theta), r_1);
@@ -338,7 +338,7 @@
Index d;
for ( d = 0 ; d < dim ; d++ )
Cmplx_Add(vector1[d], vector2[d], destination[d]);
- //printf("%f, %f", destination[d][REAL_PART], destination[d][IMAG_PART]);
+ /*printf("%f, %f", destination[d][REAL_PART], destination[d][IMAG_PART]); */
return;
}
}
@@ -395,16 +395,16 @@
Tested against http://www.engplanet.com/redirect.html?3859 */
void StGermain_ComplexVectorCrossProduct(Cmplx* destination, Cmplx* vector1, Cmplx* vector2) {
Cmplx c_1, c_2;
- //x direction
+ /*x direction */
Cmplx_Multiply(vector1[1], vector2[2], c_1);
Cmplx_Multiply(vector1[2], vector2[1], c_2);
Cmplx_Subtract(c_1, c_2, destination[0]);
- //y direction
+ /*y direction */
Cmplx_Multiply(vector1[2], vector2[0], c_1);
Cmplx_Multiply(vector1[0], vector2[2], c_2);
Cmplx_Subtract(c_1, c_2, destination[1]);
- //z direction
+ /*z direction */
Cmplx_Multiply(vector1[0], vector2[1], c_1);
Cmplx_Multiply(vector1[1], vector2[0], c_2);
Cmplx_Subtract(c_1, c_2, destination[2]);
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/FullTensorMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/FullTensorMath.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/FullTensorMath.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -196,7 +196,7 @@
double* rightEigenVec;
int row_I, col_I;
- //char* errorStringValues;
+ /*char* errorStringValues; */
Stream* errorStream = Journal_Register( ErrorStream_Type, "FullTensorMath" );
/* Set size of workspace to pass to function */
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -592,8 +592,8 @@
double **BMatrix, int rowDimB, int colDimB,
double** resultMatrix ) {
- int row_I, col_I; // location with resultMatrix
- int counter; // counter which facilitates the multiplication of AMatrix and BMatrix
+ int row_I, col_I; /* location with resultMatrix */
+ int counter; /* counter which facilitates the multiplication of AMatrix and BMatrix */
/** Error Checking Code */
Stream* error = Journal_Register( ErrorStream_Type, "TensorMultMath" );
@@ -624,7 +624,7 @@
resultMatrix_ij = AMatrix_ij x BVector_j */
void NonSquareMatrix_MatrixVectorMultiplication( double** AMatrix, int rowsInA, int colsInA,
double* BVec, int rowsInB,double* resultVector ) {
- //This assumes the resultVector is of the correct length.
+ /*This assumes the resultVector is of the correct length. */
memset(resultVector,0,sizeof(double)* rowsInA);
NonSquareMatrix_CumulativeMatrixVectorMultiplication( AMatrix, rowsInA, colsInA,
BVec, rowsInB, resultVector);
@@ -636,7 +636,7 @@
*/
void NonSquareMatrix_CumulativeMatrixVectorMultiplication( double** AMatrix, int rowsInA, int colsInA,
double* BVec, int rowsInB, double* resultVector ) {
- int row_I, col_I; // counters through matrix rows and columns respectively
+ int row_I, col_I; /* counters through matrix rows and columns respectively */
Stream* error = Journal_Register( ErrorStream_Type, "TensorMultMath" );
Journal_Firewall( ( colsInA == rowsInB ), error,
"In func '%s' column dimensions of A_Matrix = %d is not equal to the row dimensions of B_Vec = %d\n",
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/ConvexHull.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -118,7 +118,7 @@
void _ConvexHull_Init( void* convexHull, Coord_List vertexList, Index vertexCount) {
ConvexHull* self = (ConvexHull*)convexHull;
Index numberOfFaces;
- Index dimensions; // this probably doesn't need to be here
+ Index dimensions; /* this probably doesn't need to be here */
Index vertex_I;
double tmpVector1[3];
@@ -134,14 +134,14 @@
/* Now Construct normal and store them in self->facesList */
- // 1st allocate memory
+ /* 1st allocate memory */
if(vertexCount == 3) numberOfFaces = 3;
else numberOfFaces = 4;
self->facesList = Memory_Alloc_Array( XYZ, numberOfFaces, "facesList" );
- // 2nd Calculate Normals on faces
- // in 2-D
+ /* 2nd Calculate Normals on faces */
+ /* in 2-D */
if( numberOfFaces == 3 ) {
printf("THE VERTEXCOUNT IS %d\n", vertexCount);
for( vertex_I = 0; vertex_I < vertexCount ; vertex_I++ ) {
@@ -152,7 +152,7 @@
tmpVector3[0] = tmpVector1[1];
tmpVector3[1] = -1 * tmpVector1[0];
tmpVector3[2] = 0;
-// Now Vec3 is possibly normal vector
+ /* Now Vec3 is possibly normal vector */
if( StGermain_VectorDotProduct(tmpVector3, tmpVector2, dimensions) < 0 )
{ tmpVector3[0] = -1*tmpVector3[0]; tmpVector3[1] = -1 * tmpVector3[1]; }
@@ -337,10 +337,10 @@
ConvexHull* self = (ConvexHull*)convexHull;
Index vertex_I;
XYZ tmpVector;
- //Stream* stream = cf->infoStream;
+ /*Stream* stream = cf->infoStream; */
- // for the particle to be inside the shape, the dot product of its position vector with the shape face normal's must be non-positive
+ /* for the particle to be inside the shape, the dot product of its position vector with the shape face normal's must be non-positive */
for( vertex_I = 0 ; vertex_I < self->vertexCount ; vertex_I++ ) {
StGermain_VectorSubtraction(tmpVector, point, self->vertexList[ vertex_I ], self->dim );
if( StGermain_VectorDotProduct(self->facesList[ vertex_I ], tmpVector, self->dim ) > 0 ) {
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Intersection.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -238,15 +238,15 @@
memset( shapeList, 0, shapeCount * sizeof(Stg_Shape*) );
memset( isComplement, 0, shapeCount * sizeof(Bool) );
- // TALK ABOUT WITH ROB, will there be some Flag for Union or Intersection type in the XML file.
- // If so do we need another variable on the intersection class which is this flag, and then use that flag
- // to determine the method of test if a particle is inside or outside the shape
+ /* TALK ABOUT WITH ROB, will there be some Flag for Union or Intersection type in the XML file. */
+ /* If so do we need another variable on the intersection class which is this flag, and then use that flag */
+ /* to determine the method of test if a particle is inside or outside the shape */
Stream_Indent( stream );
for ( shape_I = 0 ; shape_I < shapeCount ; shape_I++) {
- // gets the textual name corresponding to the shape elements //
+ /* gets the textual name corresponding to the shape elements */
nameShape = Dictionary_Entry_Value_AsString( Dictionary_Entry_Value_GetElement( optionsList, shape_I));
if ( nameShape[0] == '!' ) {
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Shape/src/Union.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -225,10 +225,10 @@
_Stg_Shape_Construct( self, cf, data );
optionsList = Dictionary_Get( dictionary, "shapes" );
-// Journal_Firewall( vertexList != NULL,
-// Journal_Register( Error_Type, self->type ),
-// "In func %s: vertexList specifying the combination is NULL.\n",
-// __func__);
+ /* Journal_Firewall( vertexList != NULL, */
+ /* Journal_Register( Error_Type, self->type ), */
+ /* "In func %s: vertexList specifying the combination is NULL.\n", */
+ /* __func__); */
shapeCount = Dictionary_Entry_Value_GetCount(optionsList);
@@ -238,15 +238,15 @@
memset( shapeList, 0, shapeCount * sizeof(Stg_Shape*) );
memset( isComplement, 0, shapeCount * sizeof(Bool) );
- // TALK ABOUT WITH ROB, will there be some Flag for Union or Intersection type in the XML file.
- // If so do we need another variable on the combination class which is this flag, and then use that flag
- // to determine the method of test if a particle is inside or outside the shape
+ /* TALK ABOUT WITH ROB, will there be some Flag for Union or Intersection type in the XML file. */
+ /* If so do we need another variable on the combination class which is this flag, and then use that flag */
+ /* to determine the method of test if a particle is inside or outside the shape */
Stream_Indent( stream );
for ( shape_I = 0 ; shape_I < shapeCount ; shape_I++) {
- // gets the textual name corresponding to the shape elements //
+ /* gets the textual name corresponding to the shape elements */
nameShape = Dictionary_Entry_Value_AsString( Dictionary_Entry_Value_GetElement( optionsList, shape_I));
if ( nameShape[0] == '!' ) {
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmVariable.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmVariable.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -345,7 +345,7 @@
if ( dofCount == 1 )
magnitude = value[0];
else
- assert(0); //TODO
+ assert(0); /*TODO */
if ( localMin > magnitude )
localMin = magnitude;
@@ -378,7 +378,7 @@
if ( dofCount == 1 )
magnitude = value[0];
else
- assert(0); //TODO
+ assert(0); /*TODO */
if ( localMax < magnitude )
localMax = magnitude;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/TriSingleCellLayout.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/TriSingleCellLayout.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/TriSingleCellLayout.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -326,7 +326,7 @@
ShadowInfo* _TriSingleCellLayout_GetShadowInfo( void* triSingleCellLayout ) {
- //TriSingleCellLayout* self = (TriSingleCellLayout*)triSingleCellLayout;
+ /*TriSingleCellLayout* self = (TriSingleCellLayout*)triSingleCellLayout; */
/* TODO: this should return a shadow info with at least nbr info for my processors */
Journal_Firewall( 0, Swarm_Warning, "Error: %s not implemented yet!\n", __func__ );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/FieldVariable.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -218,7 +218,7 @@
self->dim = dim;
self->communicator = communicator;
self->fieldVariable_Register = fV_Register;
- //TODO put comment here
+ /*TODO put comment here */
self->isCheckpointedAndReloaded = isCheckpointedAndReloaded;
if (self != NULL && fV_Register != NULL)
FieldVariable_Register_Add( fV_Register, self );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Operator.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Operator.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Utils/src/Operator.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -101,13 +101,13 @@
}
void _Operator_Print(void* operator, Stream* stream) {
- //Operator* self = (Operator*) operator;
+ /*Operator* self = (Operator*) operator; */
abort();
}
void* _Operator_Copy( void* operator, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
- //Operator* self = (Operator*) operator;
+ /*Operator* self = (Operator*) operator; */
abort();
}
@@ -355,7 +355,7 @@
void Operator_Rounding( void* operator, double* operand0, double* result ) {
Operator* self = (Operator*) operator;
- // TODO: read this in from somewhere instead of just hard-coding it....
+ /* TODO: read this in from somewhere instead of just hard-coding it.... */
unsigned int nSigFigsToRoundTo = 6;
Index val_I;
@@ -398,7 +398,7 @@
Operator_FirewallBinary( self );
- // Must be symmetric Tensors
+ /* Must be symmetric Tensors */
if( self->dim == 2 ) {
*result = operand0[0] * operand1[0] + operand0[1] * operand1[1] + ( 2 * operand0[2] * operand1[2] );
} else {
@@ -414,7 +414,7 @@
Operator_FirewallUnary( self );
- // Must be a full Tensor
+ /* Must be a full Tensor */
*result = TensorArray_2ndInvariant( operand0, self->dim );
}
Modified: long/3D/Gale/trunk/src/StGermain/libStGermain/src/StGermain.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/libStGermain/src/StGermain.h 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/libStGermain/src/StGermain.h 2006-12-12 20:22:21 UTC (rev 5595)
@@ -43,8 +43,8 @@
#define __StGermain_StGermain_h__
#define EP_APPLICATIONS_FINALISE "StGermain_EP_ApplicationsFinalise"
-// TODO: ensure safe to remove (i.e. evertthing compiles). Shoud just append the context's contruct
-// #define EP_APPLICATIONS_POST_COMPONENTS_CONSTRUCT "StGermain_EP_ApplicationsPostComponentsConstruct"
+/* TODO: ensure safe to remove (i.e. evertthing compiles). Shoud just append the context's contruct */
+/* #define EP_APPLICATIONS_POST_COMPONENTS_CONSTRUCT "StGermain_EP_ApplicationsPostComponentsConstruct" */
#include "Base/Base.h"
#include "Discretisation/Discretisation.h"
Modified: long/3D/Gale/trunk/src/StGermain/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/src/main.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StGermain/src/main.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -44,7 +44,7 @@
#include <Python.h>
#endif
#include <mpi.h>
-//EP_APPLICATIONS_FINALISE defined in StGermain.h
+/*EP_APPLICATIONS_FINALISE defined in StGermain.h */
#include <StGermain/StGermain.h>
#include <stdio.h>
@@ -66,7 +66,7 @@
/* context */
AbstractContext* context = NULL;
- //This context may be initialised iff application plugins are loaded.
+ /*This context may be initialised iff application plugins are loaded. */
AbstractContext* replacedContext = NULL;
EntryPoint* applicationsFinalise_EP;
@@ -128,20 +128,20 @@
/* Destruct phase ---------------------------------------------------------------------------------------------------*/
- //Finalise any application plugins.
+ /*Finalise any application plugins. */
applicationsFinalise_EP = Context_GetEntryPoint( context, EP_APPLICATIONS_FINALISE );
- //If there exists an applications Finalise Entry Point, get in there and run hooks!
+ /*If there exists an applications Finalise Entry Point, get in there and run hooks! */
if(applicationsFinalise_EP != NULL)
((EntryPoint_VoidPtr_CallCast*) applicationsFinalise_EP->run)( applicationsFinalise_EP, NULL);
- //If the context got replaced, replacedContext != NULL & needs to be deleted.
+ /*If the context got replaced, replacedContext != NULL & needs to be deleted. */
Stg_Component_Destroy( context, 0 /* dummy */, False );
if(replacedContext != NULL)
Stg_Class_Delete( replacedContext );
Stg_Class_Delete( context );
Stg_Class_Delete( dictionary );
- //if( rank == procToWatch ) Memory_Print();
+ /*if( rank == procToWatch ) Memory_Print(); */
#ifdef HAVE_PYTHON
Py_Finalize();
#endif
Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -269,7 +269,7 @@
/* then build one set of the off diagonal blocks of K, and copy to the other off diags using symmetry */
for( rowNode_I=0; rowNode_I < nodesPerEl; rowNode_I++ ) {
- for( rowDof_I=0; rowDof_I < dofsPerNode-1; rowDof_I++ ) { // dont need to do anything in last row
+ for( rowDof_I=0; rowDof_I < dofsPerNode-1; rowDof_I++ ) { /* dont need to do anything in last row */
for( colNode_I=0; colNode_I < nodesPerEl; colNode_I++ ) {
for( colDof_I=rowDof_I+1; colDof_I < dofsPerNode; colDof_I++ ) {
rowIndex = rowNode_I*dofsPerNode + rowDof_I;
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -188,9 +188,9 @@
ElementType* self = (ElementType*)elementType;
Mesh* mesh = (Mesh*)_mesh;
TensorArray jacobiMatrix;
- double tolerance = 0.0001; // TODO put on class
+ double tolerance = 0.0001; /* TODO put on class */
double maxResidual;
- Iteration_Index maxIterations = 100; // TODO put on class
+ Iteration_Index maxIterations = 100; /* TODO put on class */
Iteration_Index iteration_I;
Node_Index node_I;
Node_Index nodeCount = self->nodeCount;
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -1228,7 +1228,7 @@
Stream_IndentBranch( StgFEM_Debug );
(*maxCritPointInfoPerProc) = 0;
- // allgather the totals (to save allocating unnecessary memory)
+ /* allgather the totals (to save allocating unnecessary memory) */
(*procCritPointInfoTotals) = Memory_Alloc_Array( Node_GlobalIndex, meshDecomp->nproc, "*procCritPointInfoTotals" );
MPI_Allgather( &myCritPointInfoTotal, 1, MPI_INT, (*procCritPointInfoTotals), 1, MPI_INT,
@@ -1308,23 +1308,23 @@
_FeEquationNumber_HandleNode( self, dNode_I, &currSubTotalEqNum );
- // if the node is next critical point
+ /* if the node is next critical point */
if ( ( haveCritPoint_I < critPointsIHaveTotal )
&& ( remappedGlobal_I == critPointsIHave[haveCritPoint_I].index ) )
{
Journal_DPrintfL( self->debug, 3, "storing c.p. subtotal at remapped global index %u = %d\n",
remappedGlobal_I, currSubTotalEqNum );
- // store current value
+ /* store current value */
critPointsIHave[haveCritPoint_I++].eqNum = currSubTotalEqNum;
- // check if its also a to send point
+ /* check if its also a to send point */
if ( ( sendCritPoint_I < critPointsToSendTotal )
&& ( remappedGlobal_I == critPointsToSend[sendCritPoint_I].index ) )
{
- // store current value
+ /* store current value */
critPointsToSend[sendCritPoint_I++].eqNum = currSubTotalEqNum;
}
- // reset counter and move to next point
+ /* reset counter and move to next point */
currSubTotalEqNum = 0;
}
rNodeInfo_I++;
@@ -1421,7 +1421,7 @@
for ( proc_I = 0; proc_I < meshDecomp->nproc; proc_I++ ) {
if ( proc_I == myRank ) continue;
- // reset the add list back to start
+ /* reset the add list back to start */
addListPtr = addListStart;
addListPrev = NULL;
@@ -1498,7 +1498,7 @@
if( !self->bcs || !VariableCondition_IsCondition( self->bcs, dNode_I,
self->dofLayout->varIndices[dNode_I][nodeLocalDof_I] ) )
{
- if ( (NULL == self->linkedDofInfo) || // TAG: bcs
+ if ( (NULL == self->linkedDofInfo) || /* TAG: bcs */
( self->linkedDofInfo->linkedDofTbl[dNode_I][nodeLocalDof_I] == -1 ) )
{
/* A normal point, so increment */
@@ -1522,7 +1522,7 @@
currEqNum = self->destinationArray[dNode_I][nodeLocalDof_I];
/* If current node not a shadow, then check totals */
if ( dNode_I < mesh->nodeLocalCount ) {
- if ( currEqNum != -1 ) { // TAG: bcs
+ if ( currEqNum != -1 ) { /* TAG: bcs */
if ( self->_lowestLocalEqNum == -1 ) {
/* We need this if statement to initialise this */
self->_lowestLocalEqNum = currEqNum;
@@ -1746,7 +1746,7 @@
currEqNum = self->destinationArray[dNode_I][nodeLocalDof_I];
if ( dNode_I < self->feMesh->nodeLocalCount ) {
- if ( currEqNum != -1 ) { // TAG: bcs
+ if ( currEqNum != -1 ) { /* TAG: bcs */
if ( self->_lowestLocalEqNum == -1 ) {
/* We need this if statement to initialise this */
self->_lowestLocalEqNum = currEqNum;
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/OperatorFeVariable.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -365,7 +365,7 @@
_FeVariable_Init( (FeVariable*) self, feVariableList[0]->feMesh, feVariableList[0]->geometryMesh,
NULL, NULL, NULL, NULL, NULL,
- // TODO: hack as always StgFEM native for now - PatrickSunter 7/7/2006
+/* TODO: hack as always StgFEM native for now - PatrickSunter 7/7/2006 */
StgFEM_Native_ImportExportType, StgFEM_Native_ImportExportType );
_OperatorFeVariable_Init( self, operatorName, feVariableCount, feVariableList );
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ShapeFeVariable.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -165,7 +165,7 @@
self->shape = shape;
- //EP_AppendClassHook( Context_GetEntryPoint( context, AbstractContext_EP_UpdateClass ), ParticleFeVariable_Update, self );
+/* EP_AppendClassHook( Context_GetEntryPoint( context, AbstractContext_EP_UpdateClass ), ParticleFeVariable_Update, self ); */
}
void _ShapeFeVariable_Delete( void* _shapeFeVariable ) {
@@ -185,7 +185,7 @@
void* _ShapeFeVariable_Copy( void* shapeFeVariable, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
- //ShapeFeVariable* self = (ShapeFeVariable*)shapeFeVariable;
+/* ShapeFeVariable* self = (ShapeFeVariable*)shapeFeVariable; */
ShapeFeVariable* newShapeFeVariable;
assert(0);
@@ -219,11 +219,11 @@
/* Set up the basic "level set" describiing if nodes are inside the shape or not */
for ( node_dI = 0; node_dI < Mesh_GetDomainSize( self->feMesh, MT_VERTEX ); node_dI++ ) {
if ( True == Stg_Shape_IsCoordInside( self->shape, Mesh_GetVertex( self->feMesh, node_dI ) ) ) {
- //set value = 1
+/* set value = 1 */
FeVariable_SetComponentAtNode( self, node_dI, 0, 1 );
}
else {
- //set value = 0
+/* set value = 0 */
FeVariable_SetComponentAtNode( self, node_dI, 0, 0 );
}
}
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Matrix.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Matrix.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Matrix.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -431,7 +431,7 @@
MatView (B, PETSC_VIEWER_STDOUT_WORLD);
*/
- //Journal_DPrintf( snarkDebug, "In %s():\n", __func__ );
+/* Journal_DPrintf( snarkDebug, "In %s():\n", __func__ ); */
MatGetSize( A, &rows_A, &cols_A );
MatGetSize( B, &rows_B, &cols_B );
@@ -449,7 +449,7 @@
VecCreateMPI( MPI_COMM_WORLD, PETSC_DECIDE, rows_B, &tmpColVec );
VecCreateMPI( MPI_COMM_WORLD, PETSC_DECIDE, rows_A, &newColVec );
VecGetOwnershipRange( newColVec, &start, &end );
- //Journal_DPrintf( snarkDebug, "FirstRow = %d : LastRow = %d \n",start, end );
+/* Journal_DPrintf( snarkDebug, "FirstRow = %d : LastRow = %d \n",start, end ); */
nRows = end - start;
PetscMalloc( nRows * sizeof(int), &rowId );
@@ -470,7 +470,7 @@
MatSetValues( *C, nRows, rowId, 1, &i, col2Add, INSERT_VALUES );
VecRestoreArray( newColVec, &col2Add );
- //Journal_DPrintf( snarkDebugThree, "done row %d \r",i);
+/* Journal_DPrintf( snarkDebugThree, "done row %d \r",i); */
}
MatAssemblyBegin( *C, MAT_FINAL_ASSEMBLY );
MatAssemblyEnd( *C, MAT_FINAL_ASSEMBLY );
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -483,7 +483,7 @@
if( level_i > 0 ) {
/* For all but the finest. */
fprintf(stderr,"*** MG: Setting down smoother for level %d to %s \n",level_i,info->downSmoothers[level_i]);
- SLE_Solver_MG_SetupSmoother( sleSolver, down, info->smoothers[level_i - 1], level_i, info->nLevels + 1 ); //!! i-1
+ SLE_Solver_MG_SetupSmoother( sleSolver, down, info->smoothers[level_i - 1], level_i, info->nLevels + 1 ); /* !! i-1 */
if( level_j > 0 ) {
fprintf(stderr,"*** MG: Setting up smoother for level %d to %s \n",level_i,info->upSmoothers[level_i]);
SLE_Solver_MG_SetupSmoother( sleSolver, up, info->smoothers[level_i - 1], level_i, info->nLevels + 1 );
@@ -527,7 +527,7 @@
/* Set this level's operators aswell as the residual function, except for the coarse level. */
if( level_i < info->nLevels ) {
MatrixSolver_MG_SetRestrictionOp( solver, level_j, info->rOps[level_i] );
- MatrixSolver_MG_SetInterpolationOp( solver, level_j, info->rOps[level_i] ); // ROPS <-> POPS
+ MatrixSolver_MG_SetInterpolationOp( solver, level_j, info->rOps[level_i] ); /* ROPS <-> POPS */
}
/* Set this level's work vectors. */
@@ -1088,7 +1088,7 @@
assert( info );
assert( info->stiffMat );
assert( info->rOps );
- // assert( info->pOps );
+ /* assert( info->pOps ); */
/*
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -469,8 +469,8 @@
Stg_Component_Initialise( self->phiDotField, data, False );
- //Stream* stream = Journal_Register( Info_Type, self->type );
- //FeVariable_PrintLocalDiscreteValues( self->phiDotField, stream );
+/* Stream* stream = Journal_Register( Info_Type, self->type ); */
+/* FeVariable_PrintLocalDiscreteValues( self->phiDotField, stream ); */
if ( False == context->loadFromCheckPoint ) {
DofLayout_SetAllToZero( self->phiDotField->dofLayout );
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -271,17 +271,18 @@
MatrixMultiplyAdd( gradMat, hTempVec, fVec, fTempVec ); /* fTemp = F + G hTemp : fTemp = F - G CInv h */
/* Build G CInv GTrans */
- //MatTranspose( gradMat, >rans );
- // since CInv is diagonal we can just scale mat entries by the diag vector
- Matrix_DiagonalScale( divMat, diagC, NULL ); // Div = CInve Div
- //MatMatMult_any( &tmpMat, C, *divMat ); // tmpMat = CInv Div
+/* MatTranspose( gradMat, >rans ); */
+/* since CInv is diagonal we can just scale mat entries by the diag vector */
+ Matrix_DiagonalScale( divMat, diagC, NULL ); /* Div = CInve Div */
+ /* MatMatMult_any( &tmpMat, C, *divMat ); */
+ /* tmpMat = CInv Div */
Journal_DPrintf( self->debug, "UpdivMat mat mat mult \n");
- Matrix_MatrixMult_General( &kHat, gradMat, divMat ); // tmpMat2 = G CInv Div
+ Matrix_MatrixMult_General( &kHat, gradMat, divMat ); /* tmpMat2 = G CInv Div */
Journal_DPrintf( self->debug, "done mult \n");
- Matrix_Scale( kHat, -1 ); // tmpMat2 = - G CInv Div
- Matrix_AddScaledMatrix( kHat, one, kMatrix ); // kHat = kHat + kMatrix
+ Matrix_Scale( kHat, -1 ); /* tmpMat2 = - G CInv Div */
+ Matrix_AddScaledMatrix( kHat, one, kMatrix ); /* kHat = kHat + kMatrix */
/* Setup solver context and make sure that it uses a direct solver */
@@ -294,17 +295,17 @@
/* Recover p */
if( sle->dStiffMat == NULL ) {
- // since Div was modified when C is diagonal, re build the transpose
+/* since Div was modified when C is diagonal, re build the transpose */
Matrix_Transpose( gradMat, >rans );
divMat = GTrans;
}
else {
- // never modified Div_null so set divMat to point back to it
+/* never modified Div_null so set divMat to point back to it */
divMat = sle->dStiffMat->matrix;
}
- MatrixMultiply( divMat, uVec, hTempVec ); // hTemp = Div v
- Vector_AddScaledVector( hVec, negOne, hTempVec ); // hTemp = H - hTemp : hTemp = H - Div v
- MatrixMultiply( C_InvMat, hTempVec, pVec ); // p = CInv hTemp : p = CInv ( H - Div v )
+ MatrixMultiply( divMat, uVec, hTempVec ); /* hTemp = Div v */
+ Vector_AddScaledVector( hVec, negOne, hTempVec ); /* hTemp = H - hTemp : hTemp = H - Div v */
+ MatrixMultiply( C_InvMat, hTempVec, pVec ); /* p = CInv hTemp : p = CInv ( H - Div v ) */
Matrix_Destroy( kHat );
@@ -317,6 +318,6 @@
Vector* _Stokes_SLE_PenaltySolver_GetResidual( void* solver, Index fv_I ) {
- // TODO
+/* TODO */
return NULL;
}
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -354,8 +354,8 @@
Vector* fTempVec = self->fTempVec;
Vector* vStarVec = self->vStarVec;
- MatrixSolver* velSolver = self->velSolver; // Inner velocity solver
- MatrixSolver* pcSolver = self->pcSolver; // Preconditioner
+ MatrixSolver* velSolver = self->velSolver; /* Inner velocity solver */
+ MatrixSolver* pcSolver = self->pcSolver; /* Preconditioner */
Iteration_Index maxIterations = self->maxUzawaIterations;
Iteration_Index iteration_I = 0;
@@ -383,18 +383,18 @@
/* DEFINITIONS:
- // See accompanying documentation
- // u - the displacement / velocity solution (to which constraints are applied)
- // q - the pressure-like variable which constrains the divergence displacement / velocity (= pressure for incompressible)
- // F - standard FE force vector
- // Fhat - Uzawa RHS = K^{-1} G F - h
- // K - standard FE stiffness matrix
- // Khat - Uzawa transformed stiffness matrix = G^T K^{-1} G
- // G matrix - discrete gradient operator
- // D matrix - discrete divergence operator = G^T for this particular algorithm
- // C matrix - Mass matrix (M) for compressibility
- //
- // LM & DAM
+ See accompanying documentation
+ u - the displacement / velocity solution (to which constraints are applied)
+ q - the pressure-like variable which constrains the divergence displacement / velocity (= pressure for incompressible)
+ F - standard FE force vector
+ Fhat - Uzawa RHS = K^{-1} G F - h
+ K - standard FE stiffness matrix
+ Khat - Uzawa transformed stiffness matrix = G^T K^{-1} G
+ G matrix - discrete gradient operator
+ D matrix - discrete divergence operator = G^T for this particular algorithm
+ C matrix - Mass matrix (M) for compressibility
+
+ LM & DAM
*/
/* CHOICE OF RESIDUAL:
@@ -415,7 +415,7 @@
if ( sle->fForceVec->assembleForceVector->hooks->count > 0 ) {
Journal_Printf( errorStream, "You used the following force vector assembly terms:\n" );
EntryPoint_PrintConcise( sle->fForceVec->assembleForceVector, errorStream );
- // TODO : need to print the elementForceVector assembly, not the global guy!!
+/* TODO : need to print the elementForceVector assembly, not the global guy!! */
}
Journal_Printf( errorStream,
"Please check values for building the force vector.\n" );
@@ -473,9 +473,9 @@
#endif
/* STEP 1: Estimate the magnitude of the RHS for the transformed problem
- // we compute (usually to lower accuracy than elsewhere) the RHS (Fhat - h)
- // and store the result in qTempVec.
- // LM & DAM
+ we compute (usually to lower accuracy than elsewhere) the RHS (Fhat - h)
+ and store the result in qTempVec.
+ LM & DAM
*/
Journal_DPrintfL( self->debug, 2, "Building Fhat - h.\n" );
@@ -489,23 +489,23 @@
Vector_AddScaledVector( qTempVec, -1.0, hVec );
/* WARNING:
- // If D != G^T then the resulting \hat{K} is not likely to be symmetric, positive definite as
- // required by this implementation of the Uzawa iteration. This next piece of code
- // is VERY unlikely to work properly so it's in the sin bin for the time being - LM.
- //
- // if ( D_Mat ) {
- // MatrixMultiply( D_Mat, vStarVec, qTempVec );
- // }
- // else {
- // MatrixTransposeMultiply( G_Mat, vStarVec, qTempVec );
- // }
- // LM & DAM
+ If D != G^T then the resulting \hat{K} is not likely to be symmetric, positive definite as
+ required by this implementation of the Uzawa iteration. This next piece of code
+ is VERY unlikely to work properly so it's in the sin bin for the time being - LM.
+
+ if ( D_Mat ) {
+ MatrixMultiply( D_Mat, vStarVec, qTempVec );
+ }
+ else {
+ MatrixTransposeMultiply( G_Mat, vStarVec, qTempVec );
+ }
+ LM & DAM
*/
/* STEP 2: The problem scaling - optionally normalize the uzawa residual by the magnitude of the RHS (use a relative tolerance)
- // For the inner velocity solver, Citcom uses a relative tolerance equal to that used for the Uzawa iteration as a whole
- // LM & DAM
+ For the inner velocity solver, Citcom uses a relative tolerance equal to that used for the Uzawa iteration as a whole
+ LM & DAM
*/
if (self->useAbsoluteTolerance) {
@@ -529,10 +529,10 @@
/* STEP 3: Calculate initial residual for transformed equation (\hat{F} - h - \hat{K} q_0)
- // Compute the solution to K u_0 = F - G q_0 (u_0 unknown)
- // Then G^T u* = \hat{F} - \hat{K} q_0
- // u_0 is also the initial velocity solution to which the constraint is applied by the subsequent iteration
- // LM & DAM
+ Compute the solution to K u_0 = F - G q_0 (u_0 unknown)
+ Then G^T u* = \hat{F} - \hat{K} q_0
+ u_0 is also the initial velocity solution to which the constraint is applied by the subsequent iteration
+ LM & DAM
*/
Journal_DPrintfL( self->debug, 2, "Solving for transformed Uzawa RHS.\n" );
@@ -544,13 +544,13 @@
MatrixSolver_Solve( velSolver, uVec, fTempVec );
/* Handling for NON-SYMMETRIC: relegated to sin bin (see comment above)
- // if ( D_Mat ) {
- // MatrixMultiply( D_Mat, uVec, rVec );
- // }
- // else {
- // MatrixTransposeMultiply( G_Mat, uVec, rVec );
- // }
- // LM & DAM
+ if ( D_Mat ) {
+ MatrixMultiply( D_Mat, uVec, rVec );
+ }
+ else {
+ MatrixTransposeMultiply( G_Mat, uVec, rVec );
+ }
+ LM & DAM
*/
MatrixTransposeMultiply( G_Mat, uVec, rVec );
@@ -581,10 +581,10 @@
Stream_IndentBranch( StgFEM_Debug );
/* STEP 4.1: Preconditioner
- // Solve:
- // Q_\hat{K} z_1 = r_1
- // Q_\hat{K} is an approximation to \hat{K} which is simple / trivial / quick to invert
- // LM & DAM
+ Solve:
+ Q_\hat{K} z_1 = r_1
+ Q_\hat{K} is an approximation to \hat{K} which is simple / trivial / quick to invert
+ LM & DAM
*/
if ( pcSolver )
@@ -593,11 +593,11 @@
Vector_CopyContents( rVec, qTempVec );
/* STEP 4.2: Calculate s_I, the pressure search direction
- // z_{I-1} . r_{I-1}
- // \beta = (z_{I-1} . r_{I-1}) / (z_{I-2} . r_{I-2})
- // \beta = 0 for the first iteration
- // s_I = z_(I-1) + \beta * s_(I-1)
- // LM & DAM
+ z_{I-1} . r_{I-1}
+ \beta = (z_{I-1} . r_{I-1}) / (z_{I-2} . r_{I-2})
+ \beta = 0 for the first iteration
+ s_I = z_(I-1) + \beta * s_(I-1)
+ LM & DAM
*/
Vector_DotProduct( qTempVec, rVec, &zdotr_current);
@@ -615,8 +615,8 @@
}
/* STEP 4.3: Velocity search direction corresponding to s_I is found by solving
- // K u* = G s_I
- // LM & DAM
+ K u* = G s_I
+ LM & DAM
*/
MatrixMultiply( G_Mat, sVec, fTempVec );
@@ -627,21 +627,21 @@
/* STEP 4.4: Calculate the step size ( \alpha = z_{I-1} . r_{I-1} / (s_I . \hat{K} s_I) )
- // \hat{K} s_I = G^T u* - M s_I (u* from step 4.3)
- // LM & DAM
+ \hat{K} s_I = G^T u* - M s_I (u* from step 4.3)
+ LM & DAM
*/
MatrixTransposeMultiply( G_Mat, vStarVec, qTempVec );
/* Handling for NON-SYMMETRIC: relegated to sin bin (see comment above)
- //
- // if ( D_Mat ) {
- // MatrixMultiply( D_Mat, vStarVec, qTempVec );
- // }
- // else {
- // MatrixTransposeMultiply( G_Mat, vStarVec, qTempVec );
- // }
- // LM & DAM
+
+ if ( D_Mat ) {
+ MatrixMultiply( D_Mat, vStarVec, qTempVec );
+ }
+ else {
+ MatrixTransposeMultiply( G_Mat, vStarVec, qTempVec );
+ }
+ LM & DAM
*/
if ( M_Mat ) {
@@ -657,8 +657,8 @@
/* STEP 4.5: Update pressure, velocity and value of residual
- // by \alpha times corresponding search direction
- // LM & DAM
+ by \alpha times corresponding search direction
+ LM & DAM
*/
Journal_DPrintfL( self->debug, 2, "zdotr_current = %g \n", zdotr_current);
@@ -676,7 +676,7 @@
Vector_AddScaledVector( rVec, -alpha, qTempVec );
/* STEP 4.6: store the value of z_{I-1} . r_{I-1} for the next iteration
- // LM & DAM
+ LM & DAM
*/
zdotr_previous = zdotr_current;
@@ -699,7 +699,7 @@
errorStream, "In func %s: Reached maximum number of iterations %u without converging; absResidual = %.5g, relResidual = %.5g \n",
__func__, iteration_I, absResidual, relResidual );
- // TODO: test for small change in 10 iterations and if so restart?
+/* TODO: test for small change in 10 iterations and if so restart? */
iteration_I++;
} while (*chosenResidual > self->tolerance );
@@ -718,7 +718,7 @@
Journal_PrintfL( self->info, 1, "Summary: || Div ( u ) || / || u || = %.8e\n", divU);
/* Residual for the momentum equation
- // Compute r = || F - Ku - Gp || / || F ||
+ Compute r = || F - Ku - Gp || / || F ||
*/
MatrixMultiply( G_Mat, qVec, vStarVec );
@@ -735,9 +735,9 @@
Vector_L2_Norm( fVec ) );
/* "Preconditioned" residual for the momentum equation
- // r_{w} = || Q_{K}(r) || / || Q_{K}(F)
- // fTempVec contains the residual but is overwritten once used
- // vStarVec is used to hold the diagonal preconditioner Q_{K}
+ r_{w} = || Q_{K}(r) || / || Q_{K}(F)
+ fTempVec contains the residual but is overwritten once used
+ vStarVec is used to hold the diagonal preconditioner Q_{K}
*/
Matrix_GetDiagonal( K_Mat, vStarVec );
@@ -754,7 +754,7 @@
/* Report back on the solution - velocity and pressure
- // Note - correction for dof in Vrms ??
+ Note - correction for dof in Vrms ??
*/
Journal_PrintfL( self->info, 1, "Summary: Max velocity component = %.8e; Velocity magnitude = %.8e\n",
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -571,7 +571,7 @@
Stream_Indent( self->debug );
for( proc_I=0; proc_I < nProc; proc_I++) {
if ( proc_I == myRank ) continue;
-//Journal_Printf( Journal_Register( Info_Type, "mpi" ), "!!! line %d, proc_I %d: count = %u\n", __LINE__, proc_I, reqFromOthersCounts[proc_I] );
+/* Journal_Printf( Journal_Register( Info_Type, "mpi" ), "!!! line %d, proc_I %d: count = %u\n", __LINE__, proc_I, reqFromOthersCounts[proc_I] ); */
if ( reqFromOthersCounts[proc_I] > 0 ) {
Journal_DPrintfL( self->debug, 2, "Sending to proc %d the list of %d vector entry indices I want from it:\n"
"\t(tracking via reqFromOthersHandles[%d], tag %d)\n", proc_I,
@@ -607,7 +607,7 @@
reqValuesFromMe = Memory_Alloc_2DComplex( double, nProc, reqFromMeCounts, "reqValuesFromMe" );
for( proc_I=0; proc_I < nProc; proc_I++) {
if ( proc_I == myRank ) continue;
-///Journal_Printf( Journal_Register( Info_Type, "mpi" ), "!!! line %d, proc_I %d: count = %u\n", __LINE__, proc_I, reqFromMeCounts[proc_I] );
+/* /Journal_Printf( Journal_Register( Info_Type, "mpi" ), "!!! line %d, proc_I %d: count = %u\n", __LINE__, proc_I, reqFromMeCounts[proc_I] ); */
if ( reqFromMeCounts[proc_I] > 0 ) {
MPI_Recv( reqFromMe[proc_I], reqFromMeCounts[proc_I], MPI_UNSIGNED,
proc_I, VALUE_REQUEST_TAG, comm, &status );
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -469,7 +469,7 @@
Journal_DPrintf( self->debug, "row(%s) localSize = %d : col(%s) localSize = %d \n", self->rowVariable->name,
self->rowLocalSize, self->columnVariable->name, self->colLocalSize );
- //assert( self->nonZeroCount );
+/* assert( self->nonZeroCount ); */
if( self->diagonalNonZeroIndices == NULL ) {
/* Allocate the matrix */
@@ -692,7 +692,7 @@
Memory_Free( uniqueRelatedColNodes );
- // TODO: do we need to check that diag is set to at least 1, as the PETSc webpage on MatCreate_MPIAIJ suggests?
+/* TODO: do we need to check that diag is set to at least 1, as the PETSc webpage on MatCreate_MPIAIJ suggests? */
Stream_UnIndent( self->debug );
}
@@ -1032,20 +1032,20 @@
unsigned nRows = *totalDofsThisElement[ROW_VAR];
unsigned row_i;
- // Loop over elementLM rows
+/* Loop over elementLM rows */
for( row_i = 0; row_i < nRows; row_i++ ) {
unsigned rowEqInd = elementLM[ROW_VAR][0][row_i] - rowEqNum->firstOwnedEqNum;
- // If row is bc
+/* If row is bc */
if( IndexSet_IsMember( rowEqNum->bcEqNums, rowEqInd ) ) {
unsigned nCols = *totalDofsThisElement[COL_VAR];
unsigned col_i;
- // Loop over elementLM cols
+/* Loop over elementLM cols */
for( col_i = 0; col_i < nCols; col_i++ ) {
unsigned colEqInd = elementLM[COL_VAR][0][col_i] - colEqNum->firstOwnedEqNum;
- // If col is bc
+/* If col is bc */
if( IndexSet_IsMember( colEqNum->bcEqNums, colEqInd ) ) {
elStiffMatToAdd[0][row_i * nCols + col_i] = 0.0;
}
@@ -1061,7 +1061,7 @@
for( col_i = 0; col_i < nCols; col_i++ ) {
unsigned colEqInd = elementLM[COL_VAR][0][col_i];
- // If col is bc
+/* If col is bc */
if( IndexSet_IsMember( colEqNum->bcEqNums, colEqInd ) ) {
elStiffMatToAdd[0][row_i * nCols + col_i] = 0.0;
}
@@ -1094,7 +1094,7 @@
}
}
- ////////////////////////////////////////////////////////
+/* //////////////////////////////////////////////////////// */
Matrix_AssemblyBegin( self->matrix );
Matrix_AssemblyEnd( self->matrix );
@@ -1106,7 +1106,7 @@
Vector_AssemblyEnd( self->rhs->vector );
}
- ////////////////////////////////////////////////////////
+/* //////////////////////////////////////////////////////// */
/*
** If keeping BCs in, modify the RHS to reflect BCs.
@@ -1222,7 +1222,7 @@
bcLM_Id[ *nBC_NodalDofPtr ] = &elementLM[node_elLocalI][dof_nodeLocalI] - &elementLM[0][0];
*/
- // get bc values from the bc_layout
+/* get bc values from the bc_layout */
bcValues[ *nBC_NodalDofPtr ] = DofLayout_GetValueDouble( dofLayout, node_lI, dof_nodeLocalI );
Journal_DPrintfL( self->debug, 3, "bcValues[%d]: at &LM[0][0] + %d=%d, is %f\n",
@@ -1263,7 +1263,7 @@
for( bcDof_I=0; bcDof_I < nBC_NodalDof_Row; bcDof_I++ ) {
rowEqId = bcLM_Id[ROW_VAR][bcDof_I];
bc_value = bcValues[ROW_VAR][bcDof_I];
- //printf("bc_value = %f \n",bc_value );
+/* printf("bc_value = %f \n",bc_value ); */
/* this index is gets us to the right */
sum = sum - ( elStiffMatToAdd[rowEqId][colDof_elLocalI] * bc_value );
@@ -1274,17 +1274,17 @@
Vector_AddTo( self->rhs->vector, *totalDofsThisElement[COL_VAR], (Index *)(elementLM[COL_VAR][0]), h2Add );
/* assume that K is symetric, so corrections are made with KTrans.
- // this allows us to use this func with G, when we want velocity
- // corrections from GTrans to appear in H.
+ this allows us to use this func with G, when we want velocity
+ corrections from GTrans to appear in H.
*/
/*
for( bcDof_I=0; bcDof_I < nBC_NodalDof_row; bcDof_I++ ) {
rowEqId = bcLM_Id[ROW_VAR][bcDof_I];
bc_value = bcValues[ROW_VAR][bcDof_I];
- //printf("bc_value = %f \n",bc_value );
+ printf("bc_value = %f \n",bc_value );
- // printf("bc value = %f \n",bc_value );
+ printf("bc value = %f \n",bc_value );
correct = 0;
for( colDof_elLocalI=0; colDof_elLocalI< *totalDofsThisElement[COL_VAR]; colDof_elLocalI++ ) {
h2Add[correct] = h2Add[correct]
@@ -1297,7 +1297,7 @@
Vector_AddTo( self->rhs->vector, correct, hIdx, h2Add );
*/
- // does not work
+/* does not work */
/*
for( rowDof_elLocalI=0; rowDof_elLocalI < *totalDofsThisElement[ROW_VAR]; rowDof_elLocalI++ ) {
double sum = 0.0;
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -232,12 +232,12 @@
sle,
solver,
context,
- False, //TODO: A hack put in place for setting the convergence stream to 'off' if the SLE class is created from within the code, not via an xml
+ False, /* TODO: A hack put in place for setting the convergence stream to 'off' if the SLE class is created from within the code, not via an xml */
isNonLinear,
nonLinearTolerance,
nonLinearMaxIterations,
killNonConvergent,
- 1,//TODO : hack for setting the minimum number of iterations to 1- same hack as above
+ 1,/* TODO : hack for setting the minimum number of iterations to 1- same hack as above */
entryPoint_Register,
comm );
}
@@ -257,7 +257,7 @@
Stg_Class_Delete( self->forceVectors );
Stg_Class_Delete( self->solutionVectors );
- // delete parent
+/* delete parent */
_Stg_Component_Delete( self );
Stream_UnIndentBranch( StgFEM_Debug );
}
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -42,12 +42,12 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
-//EP_APPLICATIONS_FINALISE defined in StGermain.h
+/* EP_APPLICATIONS_FINALISE defined in StGermain.h */
#include <StgFEM/StgFEM.h>
#include "Application.h"
#include <stdio.h>
-//For strcmp
+/* For strcmp */
#include <string.h>
const Type StgFEM_Application_Type = "StgFEM_Application";
@@ -60,54 +60,54 @@
AbstractContext* prevContext;
EntryPoint* applicationsFinalise_EP;
- //Get the existing context, as defined by StGermain, or an alternative plugin application.
+ /* Get the existing context, as defined by StGermain, or an alternative plugin application. */
prevContext = (AbstractContext*)Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
- //Only need to initialise a new context, and copy all relevant registers over IF this is the first application
- //plugin to be constructed.
- //The first application plugin to be constructed is Guaranteed to have the 'largest' context.
- // (ie is an inherited child of ALL other application plugins about to be loaded)
+ /* Only need to initialise a new context, and copy all relevant registers over IF this is the first application */
+ /* plugin to be constructed. */
+ /* The first application plugin to be constructed is Guaranteed to have the 'largest' context. */
+ /* (ie is an inherited child of ALL other application plugins about to be loaded) */
if( prevContext->type == AbstractContext_Type )
{
- //Set the existing abstract context.
+ /* Set the existing abstract context. */
currAbstractContext = prevContext;
- //Create a new, empty FiniteElementContext.
+ /* Create a new, empty FiniteElementContext. */
context = FiniteElementContext_New( "context", 0, 0, currAbstractContext->communicator, cf->rootDict );
context->dictionary = cf->rootDict;
- //Initialise Abstract parts of FiniteElementContext
+ /* Initialise Abstract parts of FiniteElementContext */
_AbstractContext_Init((AbstractContext*)context, 0, 0, MPI_COMM_WORLD );
- //Initialise Discretisation parts of FiniteElementContext
+ /* Initialise Discretisation parts of FiniteElementContext */
_DiscretisationContext_Init((DiscretisationContext*)context );
- //Initialise FiniteElement parts of FintieElementContext
+ /* Initialise FiniteElement parts of FintieElementContext */
_FiniteElementContext_Init( (FiniteElementContext*)context );
- //Need to get the old CF from currAbstractContext, and use that in my new context.
- //Now I CANNOT delete this currAbstractContext or I'll lose the CF. :(
+ /* Need to get the old CF from currAbstractContext, and use that in my new context. */
+ /* Now I CANNOT delete this currAbstractContext or I'll lose the CF. :( */
context->CF = currAbstractContext->CF;
- //Need to get the LCRegister componentList, and replace the existing (abstract) context
- //with the newly created (PICellerator) context!!!
+ /* Need to get the LCRegister componentList, and replace the existing (abstract) context */
+ /* with the newly created (PICellerator) context!!! */
Stg_ObjectList_Replace( context->CF->LCRegister->componentList,
((Stg_Component*) currAbstractContext)->name,
KEEP,
(Stg_Component*) context);
- //Recreate the registerRegister link in CF.
+ /* Recreate the registerRegister link in CF. */
context->CF->registerRegister = context->register_Register;
- //Create the EntryPoint for all application plugins' finalise functions to hook into.
+ /* Create the EntryPoint for all application plugins' finalise functions to hook into. */
applicationsFinalise_EP = EntryPoint_New( EP_APPLICATIONS_FINALISE, EntryPoint_VoidPtr_CastType );
EntryPoint_Register_Add(context->entryPoint_Register, (void*)applicationsFinalise_EP);
- } //close of if( prevContext->type == AbstractContext_Type)
- else //prevContext was NOT an abstract context -> that is does NOT need to be replaced
+ } /* close of if( prevContext->type == AbstractContext_Type) */
+ else /* prevContext was NOT an abstract context -> that is does NOT need to be replaced */
context = (FiniteElementContext*) prevContext;
- //Change to append -> THESE plugins are now CONSTRUCTED IN REVERSE ORDER!!!
+ /* Change to append -> THESE plugins are now CONSTRUCTED IN REVERSE ORDER!!! */
EntryPoint_Append(
Context_GetEntryPoint( context, EP_APPLICATIONS_FINALISE ),
"StgFEM App Finalise",
@@ -116,7 +116,7 @@
}
-//StgFEM finalise entry point -> needs to be called if this plugin was loaded.
+/* StgFEM finalise entry point -> needs to be called if this plugin was loaded. */
void StgFEM_Application_Finalise()
{
Stream* finaliseStream=Journal_Register(Info_Type,"StgFEM_Application");
@@ -139,7 +139,7 @@
Index StgFEM_Application_Register( PluginsManager* pluginsManager )
{
- //Initialise StgFEM context.
+ /* Initialise StgFEM context. */
StgFEM_Init(NULL, NULL);
return PluginsManager_Submit( pluginsManager, StgFEM_Application_Type, "0", _StgFEM_Application_DefaultNew );
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -249,8 +249,8 @@
char* tmpName2;
Bool scalar;
Dof_Index componentsCount;
- // TODO: hardcode for now - should be read in constructor, or read from the reference
- // feVar type, or file reader or something
+/* TODO: hardcode for now - should be read in constructor, or read from the reference */
+/* feVar type, or file reader or something */
unsigned int numSigFigsInReferenceFeVar = 15;
char* refName;
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -1041,7 +1041,7 @@
*/
_LevelSet_Redistance( self, 10 );
- //_LevelSet_InitActiveEls( self );
+/* _LevelSet_InitActiveEls( self ); */
}
/* Free all the quadrature memory. */
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -574,8 +574,8 @@
double* coord;
double x;
double y;
- double km; // for y-direction
- double kn; // for x-direction
+ double km; /* for y-direction */
+ double kn; /* for x-direction */
double wavenumberX;
double wavenumberY;
double L;
@@ -599,7 +599,7 @@
sigma = Dictionary_GetDouble_WithDefault( dictionary, "sigma", 1.0 );
kn = wavenumberX * M_PI / L;
- // TODO: Re-write Mirko's code and/or Documentation so the input parameters for these ICs are less confusing
+/* TODO: Re-write Mirko's code and/or Documentation so the input parameters for these ICs are less confusing */
km = wavenumberY / L;
*result = sigma * sinh( km * y ) * cos( kn * x );
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -262,7 +262,7 @@
tzz *= cos(n*M_PI*x);
txz *= sin(n*M_PI*x);
txx *= cos(n*M_PI*x);
-// only deviatoric stress is calculated
+/* only deviatoric stress is calculated */
mean = 0.5 * ( txx + tzz );
stress[ 0 ] = txx - mean;
stress[ 1 ] = tzz - mean;
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solB/solB.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solB/solB.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solB/solB.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -264,9 +264,9 @@
ss = Calculate_ss( self, x, z, y );
if( analyticFeVariable->dim == 2 ) {
- strainRate[1] = kn*ss_z*cos(kn*x); // zz
- strainRate[0] = -strainRate[1]; // xx
- strainRate[2] = -0.5*(ss_zz+kn*kn*ss)*sin(kn*x); // xz
+ strainRate[1] = kn*ss_z*cos(kn*x); /* zz */
+ strainRate[0] = -strainRate[1]; /* xx */
+ strainRate[2] = -0.5*(ss_zz+kn*kn*ss)*sin(kn*x); /* xz */
}
}
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -61,7 +61,7 @@
double t1,t2,t3,t4,t5,t6,t7,t8,t10,t11;
double t12,t14,t16,t21;
- // XML input and coord
+ /* XML input and coord */
/*************************************************************************/
/*************************************************************************/
sigma = self->sigma;
@@ -162,15 +162,15 @@
sum3 += -sigma*dx*(0.5-z); /* now have total zz stress */
sum6 += -sigma*dx*(0.5-z); /* now have total xx stress */
mag=sqrt(sum1*sum1+sum2*sum2);
- //printf("%0.7f %0.7f %0.7f %0.7f %0.7f %0.7f %0.7f %0.7f %0.7f %0.7f\n",x,z,sum1,sum2,sum3,sum4,sum5,sum6,mag,sum7);
+ /* printf("%0.7f %0.7f %0.7f %0.7f %0.7f %0.7f %0.7f %0.7f %0.7f %0.7f\n",x,z,sum1,sum2,sum3,sum4,sum5,sum6,mag,sum7); */
if ( whatWeWant == 1 ) {
- result[0] = sum2; //vx
- result[1] = sum1; //vz
+ result[0] = sum2; /* vx */
+ result[1] = sum1; /* vz */
}else if( whatWeWant == 2 ) {
- result[0] = sum6; //txx
- result[1] = sum3; //tzz
- result[2] = sum4; //txz
+ result[0] = sum6; /* txx */
+ result[1] = sum3; /* tzz */
+ result[2] = sum4; /* txz */
} else if (whatWeWant == 3 ) {
*result = sum5;
} else if( whatWeWant == 4 ) {
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solD/solD.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solD/solD.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solD/solD.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -1172,7 +1172,7 @@
}
void Velic_solD_StrainRateFunction( void* analyticSolution, FeVariable* analyticFeVariable, double* coord, double* strainRate ) {
-// Velic_solD* self = (Velic_solD*) analyticSolution;
+ /* Velic_solD* self = (Velic_solD*) analyticSolution; */
@@ -1199,7 +1199,7 @@
FeVariable* velocityField;
FeVariable* pressureField;
FeVariable* stressField;
- //FeVariable* strainRateField;
+ /*FeVariable* strainRateField; */
/* Construct Parent */
_AnalyticSolution_Construct( self, cf, data );
Modified: long/3D/Gale/trunk/src/StgFEM/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/src/main.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/StgFEM/src/main.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -126,7 +126,7 @@
Stg_Class_Delete( context );
Stg_Class_Delete( dictionary );
- //if( rank == procToWatch ) Memory_Print();
+/* if( rank == procToWatch ) Memory_Print(); */
#ifdef HAVE_PYTHON
Py_Finalize();
#endif
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/Arrhenius.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/Arrhenius.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/Arrhenius.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -127,7 +127,7 @@
/* Construct Parent */
_Rheology_Construct( self, cf, data );
- // TODO: 'KeyFallback' soon to be deprecated/updated
+ /* TODO: 'KeyFallback' soon to be deprecated/updated */
temperatureField = Stg_ComponentFactory_ConstructByNameWithKeyFallback(
cf, self->name, "TemperatureField", "TemperatureField", FeVariable, True, data );
/*temperatureField = Stg_ComponentFactory_ConstructByKey(
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/Byerlee.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/Byerlee.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/Byerlee.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -138,7 +138,7 @@
/* Construct Parent */
_VonMises_Construct( self, cf, data );
- // TODO: "KeyFallback' soon to be deprecated/updated
+ /* TODO: "KeyFallback' soon to be deprecated/updated */
/*
geometry = Stg_ComponentFactory_ConstructByNameWithKeyFallback(
cf, self->name, "geometry", "BlockGeometry", BlockGeometry, True, data );
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/Director.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/Director.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/Director.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -202,7 +202,7 @@
_TimeIntegratee_Construct( self, cf, data );
/* Construct 'Director' stuff */
- // TODO: 'KeyFallback' soon to be deprecated/updated
+ /* TODO: 'KeyFallback' soon to be deprecated/updated */
velGradField = Stg_ComponentFactory_ConstructByNameWithKeyFallback(
cf, self->name, "VelocityGradientsField", "VelocityGradientsField", FeVariable, True, data );
/*
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/DruckerPrager.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -193,7 +193,7 @@
/* Construct Parent */
_VonMises_Construct( self, cf, data );
- // TODO: KeyFallback soon to be deprecated/updated
+ /* TODO: KeyFallback soon to be deprecated/updated */
pressureField = Stg_ComponentFactory_ConstructByNameWithKeyFallback(
cf, self->name, "PressureField", "PressureField", FeVariable, True, data );
/*pressureField = Stg_ComponentFactory_ConstructByKey(
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/FrankKamenetskii.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/FrankKamenetskii.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/FrankKamenetskii.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -124,7 +124,7 @@
/* Construct Parent */
_Rheology_Construct( self, cf, data );
- // TODO: KeyFallback soon to be deprecated/updated
+ /* TODO: KeyFallback soon to be deprecated/updated */
temperatureField = Stg_ComponentFactory_ConstructByNameWithKeyFallback(
cf,
self->name,
@@ -133,7 +133,7 @@
FeVariable,
True,
data );
- //temperatureField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "TemperatureField", FeVariable, True );
+ /*temperatureField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "TemperatureField", FeVariable, True ); */
_FrankKamenetskii_Init(
self,
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/NonNewtonian.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/NonNewtonian.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/NonNewtonian.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -126,7 +126,7 @@
/* Construct Parent */
_Rheology_Construct( self, cf, data );
- // TODO: 'Keyfallback' soon to be deprecated/updated
+ /* TODO: 'Keyfallback' soon to be deprecated/updated */
strainRateInvField = Stg_ComponentFactory_ConstructByNameWithKeyFallback(
cf,
self->name,
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/Orthotropic.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/Orthotropic.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/Orthotropic.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -181,7 +181,7 @@
/* how does this get called eventually? */
void _Orthotropic_ModifyConstitutiveMatrix(
void* rheology,
- ConstitutiveMatrix* constitutiveMatrix, // constitutive matrix
+ ConstitutiveMatrix* constitutiveMatrix, /* constitutive matrix */
MaterialPointsSwarm* swarm,
Element_LocalIndex lElement_I,
MaterialPoint* materialPoint,
@@ -286,9 +286,9 @@
constitutiveMatrix->isDiagonal = False;
-// printf("In %s OK\n\n",__func__);
-// flag = 1;
-// }
+ /* printf("In %s OK\n\n",__func__); */
+ /* flag = 1; */
+ /* } */
/* for(i=0;i<dim*(dim+1)/2;i++){ */
/* for(j=0;j<dim*(dim+1)/2;j++){ */
/* printf("Matrix Data = %g [%d %d]\n",constitutiveMatrix->matrixData[i][j],i,j); */
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/OrthotropicAligned.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/OrthotropicAligned.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/OrthotropicAligned.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -88,8 +88,8 @@
double viscosity1, double viscosity2,
double viscosity3, double viscosity4,
double viscosity5, double viscosity6 ) {
-// self->director = director;
-// self->viscosityRatio = viscosityRatio;
+ /* self->director = director; */
+ /* self->viscosityRatio = viscosityRatio; */
/* OrthotropicAligned_ParticleExt* particleExt;
StandardParticle materialPoint;
@@ -122,7 +122,7 @@
void _OrthotropicAligned_Construct( void* rheology, Stg_ComponentFactory* cf, void* data ){
OrthotropicAligned* self = (OrthotropicAligned*)rheology;
-// Director* director;
+ /* Director* director; */
double viscosity1;
double viscosity2;
double viscosity3;
@@ -133,7 +133,7 @@
/* Construct Parent */
_Rheology_Construct( self, cf, data );
-// director = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Director", Director, True ) ;
+ /* director = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Director", Director, True ) ; */
viscosity1 = Stg_ComponentFactory_GetDouble( cf, self->name, "viscosity1", True );
viscosity2 = Stg_ComponentFactory_GetDouble( cf, self->name, "viscosity2", True );
viscosity3 = Stg_ComponentFactory_GetDouble( cf, self->name, "viscosity3", True );
@@ -154,7 +154,7 @@
/* how does this get called eventually? */
void _OrthotropicAligned_ModifyConstitutiveMatrix(
void* rheology,
- ConstitutiveMatrix* constitutiveMatrix, // constitutive matrix
+ ConstitutiveMatrix* constitutiveMatrix, /* constitutive matrix */
MaterialPointsSwarm* swarm,
Element_LocalIndex lElement_I,
MaterialPoint* materialPoint,
@@ -162,18 +162,18 @@
{
OrthotropicAligned* self = (OrthotropicAligned*) rheology;
Dimension_Index dim = swarm->dim;
-// double isotropicViscosity = ConstitutiveMatrix_GetIsotropicViscosity( constitutiveMatrix );
-// double deltaViscosity;
-// XYZ normal;
+ /* double isotropicViscosity = ConstitutiveMatrix_GetIsotropicViscosity( constitutiveMatrix ); */
+ /* double deltaViscosity; */
+ /* XYZ normal; */
int i,j;
double** D = constitutiveMatrix->matrixData;
-// static int flag = 0;
-// deltaViscosity = isotropicViscosity * (1.0 - self->viscosityRatio);
-// Director_GetNormal( self->director, materialPoint, normal );
+ /* static int flag = 0; */
+ /* deltaViscosity = isotropicViscosity * (1.0 - self->viscosityRatio); */
+ /* Director_GetNormal( self->director, materialPoint, normal ); */
-// ConstitutiveMatrix_SetSecondViscosity( constitutiveMatrix, deltaViscosity, normal );
+ /* ConstitutiveMatrix_SetSecondViscosity( constitutiveMatrix, deltaViscosity, normal ); */
-// if(!flag){/* if not visited modify matrix else no need to update */
+ /* if(!flag){/* if not visited modify matrix else no need to update */ */
/* Snark dies if I only allow this to be called once.. */
/* ahh need to allow it to be called once for every particle */
for(i=0;i<dim*(dim+1)/2;i++){
@@ -191,9 +191,9 @@
D[5][5] = self->viscosity6;
}
constitutiveMatrix->isDiagonal = True;
-// printf("In %s OK\n\n",__func__);
-// flag = 1;
-// }
+ /* printf("In %s OK\n\n",__func__); */
+ /* flag = 1; */
+ /* } */
/* for(i=0;i<dim*(dim+1)/2;i++){ */
/* for(j=0;j<dim*(dim+1)/2;j++){ */
/* printf("Matrix Data = %g [%d %d]\n",constitutiveMatrix->matrixData[i][j],i,j); */
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/RheologyMaterial.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/RheologyMaterial.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/RheologyMaterial.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -115,7 +115,7 @@
for ( rheology_I = 0 ; rheology_I < rheologyCount ; rheology_I++ )
Rheology_Register_Add( self->rheology_Register, rheologyList[ rheology_I ] );
-// self->debug = Journal_Register( Debug_Type, self->type ); /* TODO make child of Underworld_Debug */
+ /* self->debug = Journal_Register( Debug_Type, self->type ); /* TODO make child of Underworld_Debug */
}
void _RheologyMaterial_Delete( void* rheologyMaterial ) {
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/StoreStress.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/StoreStress.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/StoreStress.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -176,7 +176,7 @@
MaterialPointsSwarm,
True,
data );
- // TODO : 'KeyFallback' soon to be deprecated/updated
+ /* TODO : 'KeyFallback' soon to be deprecated/updated */
strainRateField = Stg_ComponentFactory_ConstructByNameWithKeyFallback(
cf,
self->name,
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/VonMises.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/VonMises.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/VonMises.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -151,7 +151,7 @@
/* Construct Parent */
_YieldRheology_Construct( self, cf, data );
- // TODO: soon to be deprecated/updated
+ /* TODO: soon to be deprecated/updated */
strainRateField = Stg_ComponentFactory_ConstructByNameWithKeyFallback(
cf,
self->name,
@@ -160,8 +160,8 @@
FeVariable,
True,
data );
- //strainRateField = Stg_ComponentFactory_ConstructByKey(
- // cf, self->name, "StrainRateField", FeVariable, True );
+ /*strainRateField = Stg_ComponentFactory_ConstructByKey( */
+ /* cf, self->name, "StrainRateField", FeVariable, True ); */
_VonMises_Init(
Modified: long/3D/Gale/trunk/src/Underworld/plugins/Application/Application.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Application/Application.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Application/Application.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -47,16 +47,16 @@
#endif
#include <mpi.h>
-//EP_APPLICATIONS_FINALISE defined in StGermain.h
+/*EP_APPLICATIONS_FINALISE defined in StGermain.h */
#include <StGermain/StGermain.h>
-//Must include StgFEM library, but WON'T call Stg_FEM_Init in this plugin.
+/*Must include StgFEM library, but WON'T call Stg_FEM_Init in this plugin. */
#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
#include <Underworld/Underworld.h>
#include "Application.h"
#include <stdio.h>
-//for strcmp
+/*for strcmp */
#include <string.h>
const Type Underworld_Application_Type = "Underworld_Application";
@@ -72,53 +72,53 @@
EntryPoint* applicationsPostConstruct_EP;
#endif
- //Get the existing abstract context, as defined by StGermain.
- //Get it up here, so the communicator can be used for messages.
+ /*Get the existing abstract context, as defined by StGermain. */
+ /*Get it up here, so the communicator can be used for messages. */
prevContext = (AbstractContext*)Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
- //Only need to initialise a new context, and copy all relevant registers over IF this is the first application
- //plugin to be constructed.
- //The first application plugin to be constructed is Guaranteed to have the 'largest' context.
- // (ie is an inherited child of ALL other application plugins about to be loaded)
+ /*Only need to initialise a new context, and copy all relevant registers over IF this is the first application */
+ /*plugin to be constructed. */
+ /*The first application plugin to be constructed is Guaranteed to have the 'largest' context. */
+ /* (ie is an inherited child of ALL other application plugins about to be loaded) */
if( prevContext->type == AbstractContext_Type )
{
- //Set the existing abstract context.
+ /*Set the existing abstract context. */
currAbstractContext = prevContext;
- //Create a new, empty UnderworldContext.
+ /*Create a new, empty UnderworldContext. */
context = UnderworldContext_New( "context", 0, 0, currAbstractContext->communicator, cf->rootDict );
context->dictionary = cf->rootDict;
- //Initialise Abstract parts of UnderworldContext
+ /*Initialise Abstract parts of UnderworldContext */
_AbstractContext_Init((AbstractContext*)context, 0, 0, MPI_COMM_WORLD );
- //Initialise Discretisation parts of UnderworldContext
+ /*Initialise Discretisation parts of UnderworldContext */
_DiscretisationContext_Init((DiscretisationContext*)context );
- //Initialise FiniteElement parts of UnderworldContext
+ /*Initialise FiniteElement parts of UnderworldContext */
_FiniteElementContext_Init( (FiniteElementContext*)context );
- //Initialise PIcellerator parts of UnderworldContext
+ /*Initialise PIcellerator parts of UnderworldContext */
_PICelleratorContext_Init( (PICelleratorContext*)context );
- //Initialise Underworld parts of UnderworldContext
+ /*Initialise Underworld parts of UnderworldContext */
_UnderworldContext_Init( context );
- //Need to get the old CF from currAbstractContext, and use that in my new context.
- //Now I CANNOT delete this currAbstractContext or I'll lose the CF. :(
+ /*Need to get the old CF from currAbstractContext, and use that in my new context. */
+ /*Now I CANNOT delete this currAbstractContext or I'll lose the CF. :( */
context->CF = currAbstractContext->CF;
- //Need to get the LCRegister componentList, and replace the existing (abstract) context
- //with the newly created (Underworld) context!!!
+ /*Need to get the LCRegister componentList, and replace the existing (abstract) context */
+ /*with the newly created (Underworld) context!!! */
Stg_ObjectList_Replace( context->CF->LCRegister->componentList,
((Stg_Component*) currAbstractContext)->name,
KEEP,
(Stg_Component*) context);
- //Recreate the registerRegister link in CF.
+ /*Recreate the registerRegister link in CF. */
context->CF->registerRegister = context->register_Register;
- //Create the EntryPoint for all application plugins' finalise functions to hook into.
+ /*Create the EntryPoint for all application plugins' finalise functions to hook into. */
applicationsFinalise_EP = EntryPoint_New( EP_APPLICATIONS_FINALISE, EntryPoint_VoidPtr_CastType );
EntryPoint_Register_Add(context->entryPoint_Register, (void*)applicationsFinalise_EP);
- } //close of if(context->type == AbstractContext_Type)
- else //prevContext was NOT an abstract context -> that is does NOT need to be replaced
+ } /*close of if(context->type == AbstractContext_Type) */
+ else /*prevContext was NOT an abstract context -> that is does NOT need to be replaced */
context = (UnderworldContext*) prevContext;
EntryPoint_Append( Context_GetEntryPoint( context, EP_APPLICATIONS_FINALISE ),
@@ -151,7 +151,7 @@
Index Underworld_Application_Register( PluginsManager* pluginsManager )
{
- //Initialise the Underworld context.
+ /*Initialise the Underworld context. */
Underworld_Init( NULL, NULL);
#ifdef HAVE_PYTHON
Py_Initialize();
Modified: long/3D/Gale/trunk/src/Underworld/plugins/MovingMesh/MovingMesh.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/MovingMesh/MovingMesh.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/plugins/MovingMesh/MovingMesh.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -101,7 +101,7 @@
__func__ );
/* */
- // TODO: this timeIntegrator interface seems weird. Would have thought you'd pass a ptr to self.
+ /* TODO: this timeIntegrator interface seems weird. Would have thought you'd pass a ptr to self. */
TimeIntegrator_PrependFinishEP(
context->timeIntegrator, "Underworld_MovingMesh_Remesh", Underworld_MovingMesh_Remesh,
CURR_MODULE_NAME, self );
@@ -524,7 +524,7 @@
MPI_Allreduce( newWallCoordsInRemeshAxis, newWallCoordsInRemeshAxisGlobal, sideWallNodeCount,
MPI_DOUBLE, mpiOperation, comm );
- // TODO : should really do another iteration over all the nodes, checking identical
+ /* TODO : should really do another iteration over all the nodes, checking identical */
Memory_Free( newWallCoordsInRemeshAxis );
}
Modified: long/3D/Gale/trunk/src/Underworld/plugins/MovingMeshEnergyCorrection/MovingMeshEnergyCorrection.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/MovingMeshEnergyCorrection/MovingMeshEnergyCorrection.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/plugins/MovingMeshEnergyCorrection/MovingMeshEnergyCorrection.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -195,7 +195,7 @@
coord = Mesh_GetVertex( mesh, localNode_I );
Grid_Lift( vertGrid, globalNode_I, globalNodeIJK );
- array_I = globalNodeIJK[ J_AXIS ] * dof; // TODO GET TO WORK IN 3D
+ array_I = globalNodeIJK[ J_AXIS ] * dof; /* TODO GET TO WORK IN 3D */
movingMeshVelocity[ I_AXIS ] =
(coord[ I_AXIS ] - min[ I_AXIS ])/(max[ I_AXIS ] - min[ I_AXIS ]) *
( xRightVelocities[ array_I ] - xLeftVelocities[ array_I ] ) + xLeftVelocities[ array_I ];
Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/AverageTemperature.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/AverageTemperature.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/AverageTemperature.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -101,7 +101,7 @@
elementType = FeMesh_GetElementType( mesh, lElement_I );
lCell_I = CellLayout_MapElementIdToCellId( swarm->cellLayout, lElement_I );
cellParticleCount = swarm->cellParticleCountTbl[ lCell_I ];
- // get particles in each element that makes up the patch
+ /* get particles in each element that makes up the patch */
for( cParticle_I = 0 ; cParticle_I < cellParticleCount ; cParticle_I++ ) {
particle = (IntegrationPoint*) Swarm_ParticleInCellAt( swarm, lCell_I, cParticle_I );
FeVariable_InterpolateWithinElement( temperatureFe, lElement_I, particle->xi, &particleTemperature );
Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/ConvectionData/ConvectionData.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/ConvectionData/ConvectionData.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/ConvectionData/ConvectionData.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -87,7 +87,7 @@
rheology = (Rheology*)Stg_ComponentFactory_ConstructByName( context->CF, "temperatureDependence", Rheology, False, 0 /* dummy */ );
nonNewtonian = (NonNewtonian*)LiveComponentRegister_Get( context->CF->LCRegister, NonNewtonian_Type );
- //(NonNewtonian*)Stg_ComponentFactory_ConstructByName( context->CF, "nonNewtonian", NonNewtonian, True, 0 /* dummy */ );
+ /* (NonNewtonian*)Stg_ComponentFactory_ConstructByName( context->CF, "nonNewtonian", NonNewtonian, True, 0 */ /* dummy */ /* ); */
(nonNewtonian == NULL) ? (self->stressExponent = 1) :
(self->stressExponent = nonNewtonian->stressExponent) ;
@@ -104,8 +104,8 @@
self->Ra = Stg_ComponentFactory_GetRootDictDouble( context->CF, "Ra", 1.0 );
self->eta0 = ( arrhenius != NULL ? arrhenius->eta0 : frankKamenetskii->eta0 );
-// self->stressExponent = nonNewtonian->stressExponent;
- self->rheologyName = rheology->type;//( arrhenius != NULL ? StG_Strdup(arrhenius->type) : StG_Strdup(frankKamenetskii->type) );
+ /* self->stressExponent = nonNewtonian->stressExponent; */
+ self->rheologyName = rheology->type;/*( arrhenius != NULL ? StG_Strdup(arrhenius->type) : StG_Strdup(frankKamenetskii->type) ); */
self->boundaryLayersPlugin = (Underworld_BoundaryLayers*)LiveComponentRegister_Get(
context->CF->LCRegister,
Underworld_BoundaryLayers_Type );
@@ -129,7 +129,7 @@
Stg_asprintf( &filename, "ConvectionData.dat", context->rank, context->nproc );
Stream_RedirectFile_WithPrependedPath( dataStream, context->outputPath, filename );
Stream_SetAutoFlush( dataStream, True );
- // Print Header
+ /* Print Header */
Journal_Printf( dataStream, "#Rheology | etaContrast | Ra | UpperVrms | LowerVrms | UTBL | LTBL | SurfaceMobility\n");
Memory_Free( filename );
@@ -160,7 +160,7 @@
deltaViscosity = pow(self->eta0, (-1/self->stressExponent) );
Journal_Printf( dataStream, "%s %g %g ", self->rheologyName, deltaViscosity, self->Ra );
- // Prints out Surface Vrms
+ /* Prints out Surface Vrms */
topVrms = Underworld_ConvectionData_XZPlaneVrms( context, maxCrd[ J_AXIS ] );
Journal_Printf( dataStream, " %g", topVrms );
@@ -238,7 +238,7 @@
sizeof(Underworld_ConvectionData),
Underworld_ConvectionData_Type,
_Underworld_ConvectionData_Delete,
- //_Codelet_Delete,
+ /*_Codelet_Delete, */
_Codelet_Print,
_Codelet_Copy,
_Underworld_ConvectionData_DefaultNew,
Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/CylinderNodeProfiling/CylinderNodeProfiling.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/CylinderNodeProfiling/CylinderNodeProfiling.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/CylinderNodeProfiling/CylinderNodeProfiling.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -104,17 +104,17 @@
Journal_Printf( stream, "\t\tNode Profile in Y direction, starting at (%.6g, %.6g, %.6g)\tat temperature = %g\n",
nodeCoord[0], nodeCoord[1], nodeCoord[2], nodeTemp );
- newNodeID = mesh->nodeNeighbourTbl[ startProfileNodeID ][ 1 ]; // 1 = +y direction, 2 = +z direction
- if( newNodeID >= mesh->nodeLocalCount ) { // is node NOT a local, thus stop profiling
+ newNodeID = mesh->nodeNeighbourTbl[ startProfileNodeID ][ 1 ]; /* 1 = +y direction, 2 = +z direction */
+ if( newNodeID >= mesh->nodeLocalCount ) { /* is node NOT a local, thus stop profiling */
Journal_Printf( stream, "\t\tProfiling has reached the boundary of the local processor\n");
- } else { // continue profiling
+ } else { /* continue profiling */
nodeTemp = FeVariable_GetScalarAtNode( temperatureFe, newNodeID );
while( nodeTemp > 0.0 ) {
nodeCoord = Mesh_CoordAt( mesh, newNodeID );
Journal_Printf( stream, "\t\t (%.6g, %.6g, %.6g)\tat temperature = %g\n", nodeCoord[0], nodeCoord[1], nodeCoord[2], nodeTemp );
newNodeID = mesh->nodeNeighbourTbl[ newNodeID ][ 1 ];
if( newNodeID >= mesh->nodeLocalCount ) {
- // is node not a local i.e. not on processor, tus stop profiling
+ /* is node not a local i.e. not on processor, tus stop profiling */
Journal_Printf( stream, "\t\tProfiling has reached the boundary of the local processor\n");
break;
}
Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/Nusselt_deltaT/Nusselt_deltaT.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/Nusselt_deltaT/Nusselt_deltaT.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/Nusselt_deltaT/Nusselt_deltaT.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -129,8 +129,8 @@
context->CF->LCRegister,
Underworld_Nusselt_deltaT_Type );
- // get_layer value
- //self->shfl = FeVariable_AverageTopLayer( self->dTField, context->gaussSwarm, NULL, J_AXIS );
+ /* get_layer value */
+ /*self->shfl = FeVariable_AverageTopLayer( self->dTField, context->gaussSwarm, NULL, J_AXIS ); */
self->shfl = FeVariable_AverageTopLayer( self->dTField, context->gaussSwarm, J_AXIS );
temp = FeVariable_AveragePlane( temperatureField, J_AXIS, 0.0 );
Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/Shfl/Shfl.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/Shfl/Shfl.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/Shfl/Shfl.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -91,18 +91,18 @@
Underworld_Error,
"Cannot find gauss swarm. Cannot use %s.\n", CURR_MODULE_NAME );
- // Create Some FeVariables to calculate shear heat flux
+ /* Create Some FeVariables to calculate shear heat flux */
temperatureField = FieldVariable_Register_GetByName( fV_Register, "TemperatureField" );
velocityField = FieldVariable_Register_GetByName( fV_Register, "VelocityField" );
temperatureGradientsField = FieldVariable_Register_GetByName( fV_Register, "TemperatureGradientsField" );
- // get uT
+ /* get uT */
advectiveHeatFluxField = OperatorFeVariable_NewBinary(
"AdvectiveHeatFluxField",
temperatureField,
velocityField,
"VectorScale" );
- // get dTdz - uT
+ /* get dTdz - uT */
temperatureTotalDerivField = OperatorFeVariable_NewBinary(
"TemperatureTotalDerivField",
advectiveHeatFluxField,
@@ -130,7 +130,7 @@
context->CF->LCRegister,
Underworld_Shfl_Type );
- // get_layer value
+ /* get_layer value */
self->shfl = FeVariable_AveragePlane( self->dTField, J_AXIS, 1.0 );
temp = FeVariable_AveragePlane( temperatureField, J_AXIS, 0.0 );
Modified: long/3D/Gale/trunk/src/Underworld/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/src/main.c 2006-12-12 20:22:18 UTC (rev 5594)
+++ long/3D/Gale/trunk/src/Underworld/src/main.c 2006-12-12 20:22:21 UTC (rev 5595)
@@ -115,7 +115,7 @@
Stg_Class_Delete( context );
Stg_Class_Delete( dictionary );
- //if( rank == procToWatch ) Memory_Print();
+ /*if( rank == procToWatch ) Memory_Print(); */
#ifdef HAVE_PYTHON
Py_Finalize();
More information about the cig-commits
mailing list