[cig-commits] r5805 - in long/3D/Gale/trunk/src/PICellerator: .
MaterialPoints/tests MaterialPoints/tests/plugins Weights/src
Weights/tests
walter at geodynamics.org
walter at geodynamics.org
Wed Jan 17 16:07:27 PST 2007
Author: walter
Date: 2007-01-17 16:07:26 -0800 (Wed, 17 Jan 2007)
New Revision: 5805
Modified:
long/3D/Gale/trunk/src/PICellerator/
long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/plugins/testAdvection.c
long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/testPeriodicBCs.c
long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c
long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.c
Log:
r559 at earth (orig r408): WalterLandry | 2007-01-16 12:05:27 -0800
Fix C++ style comments
Property changes on: long/3D/Gale/trunk/src/PICellerator
___________________________________________________________________
Name: svk:merge
- 00de75e2-39f1-0310-8538-9683d00a49cc:/branches/decomp3d:404
00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:381
aee11096-cf10-0410-a191-eea5772ba81f:/cig:524
+ 00de75e2-39f1-0310-8538-9683d00a49cc:/branches/decomp3d:408
00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:381
aee11096-cf10-0410-a191-eea5772ba81f:/cig:524
Modified: long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/plugins/testAdvection.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/plugins/testAdvection.c 2007-01-17 22:24:24 UTC (rev 5804)
+++ long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/plugins/testAdvection.c 2007-01-18 00:07:26 UTC (rev 5805)
@@ -117,8 +117,8 @@
currentRadius = StGermain_VectorMagnitude( coord, 2 );
originalRadius = StGermain_VectorMagnitude( originalCoord, 2 );
- //if ( originalRadius >= 1.0 || currentRadius >= 1.0 )
- // continue;
+ /* if ( originalRadius >= 1.0 || currentRadius >= 1.0 ) */
+ /* continue; */
originalTheta = acos( originalCoord[ I_AXIS ]/originalRadius );
if ( originalCoord[ J_AXIS ] < 0.0 )
Modified: long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/testPeriodicBCs.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/testPeriodicBCs.c 2007-01-17 22:24:24 UTC (rev 5804)
+++ long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/testPeriodicBCs.c 2007-01-18 00:07:26 UTC (rev 5805)
@@ -153,10 +153,10 @@
Dictionary_Add( dictionary, "particlesPerCell", Dictionary_Entry_Value_FromUnsignedInt( 1 ) );
Dictionary_Add( dictionary, "seed", Dictionary_Entry_Value_FromUnsignedInt( 13 ) );
Dictionary_Add( dictionary, "shadowDepth", Dictionary_Entry_Value_FromUnsignedInt( 1 ) );
- // TODO: a 2nd test with the periodic shadowing enabled. Its handy to keep the orig one
- // without it though.
- //Dictionary_Add( dictionary, "isPeriodicI", Dictionary_Entry_Value_FromBool( True ) );
- //Dictionary_Add( dictionary, "isPeriodicJ", Dictionary_Entry_Value_FromBool( True ) );
+ /* TODO: a 2nd test with the periodic shadowing enabled. Its handy to keep the orig one */
+ /* without it though. */
+ /* Dictionary_Add( dictionary, "isPeriodicI", Dictionary_Entry_Value_FromBool( True ) ); */
+ /* Dictionary_Add( dictionary, "isPeriodicJ", Dictionary_Entry_Value_FromBool( True ) ); */
decompDims = 1;
/* Run the mesher */
Modified: long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c 2007-01-17 22:24:24 UTC (rev 5804)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/src/DVCWeights.c 2007-01-18 00:07:26 UTC (rev 5805)
@@ -706,16 +706,16 @@
if (k == numx){ k--; }
if (j == numy) { j--; }
if (l == numz) { l--; }
- (*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. */
_DVCWeights_UpdateBchain(bchain,cells,i);
}
count = i;/* number of particles */
@@ -755,18 +755,18 @@
j--;
}
- (*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. */
_DVCWeights_UpdateBchain2D( bchain, cells, i);
- }//nump
+ }/* nump */
claimed = 1;
Modified: long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.c 2007-01-17 22:24:24 UTC (rev 5804)
+++ long/3D/Gale/trunk/src/PICellerator/Weights/tests/testDVCWeights.c 2007-01-18 00:07:26 UTC (rev 5805)
@@ -67,8 +67,8 @@
stream = Journal_Register( InfoStream_Type, "testDVCWeights" );
stJournal->firewallProducesAssert = False;
- //Stream_RedirectFile(Journal_Register( Error_Type, "FullTensorMath"), "FullTensorMath.txt");
- //Stream_RedirectFile(stream, "FullTensorMath.txt");
+ /* Stream_RedirectFile(Journal_Register( Error_Type, "FullTensorMath"), "FullTensorMath.txt"); */
+ /* Stream_RedirectFile(stream, "FullTensorMath.txt"); */
if( argc >= 2 ) {
@@ -81,17 +81,17 @@
if( rank == procToWatch ) {
double dx,dy,dz,da;
- static struct cell *cells;// the 3D connected grid
- struct particle *pList;// 3D particle List
- struct chain *bchain;//3D boundary chain
+ static struct cell *cells;/* the 3D connected grid */
+ struct particle *pList;/* 3D particle List */
+ struct chain *bchain;/* 3D boundary chain */
- static struct cell2d *cells2D;// the 2D connected grid
- struct particle2d *pList2D;//2D particle List
- struct chain *bchain2D;//2D boundary chain
+ static struct cell2d *cells2D;/* the 2D connected grid */
+ struct particle2d *pList2D;/* 2D particle List */
+ struct chain *bchain2D;/* 2D boundary chain */
int nump,numx,numy,numz;
int px, py, pz;
- 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;
@@ -112,7 +112,7 @@
Journal_Printf( stream, "Test _DVCWeights_ConstructGrid function \n");
Journal_Printf( stream, "****************************\n");
- //Define the resolution
+ /* Define the resolution */
numx = 2;
numy = 2;
@@ -138,7 +138,7 @@
Journal_Printf( stream, "Test _DVCWeights_InitialiseStructs function \n");
Journal_Printf( stream, "****************************\n");
- //Define the number of particles
+ /* Define the number of particles */
px = 2;
py = 2;
pz = 2;
@@ -174,7 +174,7 @@
dy = (BBYMAX - BBYMIN)/numy;
dz = (BBZMAX - BBZMIN)/numz;
da = dx*dy*dz;
- //Initialise particle coords
+ /* Initialise particle coords */
l = 0;
for(i = 0; i < px ;i++){
for ( j = 0; j < py ; j++) {
@@ -266,7 +266,7 @@
Journal_Printf( stream, "Test _DVCWeights_ConstructGrid2D function \n");
Journal_Printf( stream, "****************************\n");
- //Define the resolution
+ /* Define the resolution */
numx = 2;
numy = 2;
@@ -291,7 +291,7 @@
Journal_Printf( stream, "Test _DVCWeights_InitialiseStructs2D function \n");
Journal_Printf( stream, "****************************\n");
- //Define size of swarm-to-be
+ /* Define size of swarm-to-be */
px = 2;
py = 2;
nump = px * py ;
@@ -325,7 +325,7 @@
dx = (BBXMAX - BBXMIN)/numx;
dy = (BBYMAX - BBYMIN)/numy;
da = dx*dy;
- //Initialise particle coords
+ /* Initialise particle coords */
l = 0;
for(i = 0; i < px ;i++){
for ( j = 0; j < py ; j++) {
More information about the cig-commits
mailing list