[cig-commits] r5813 - in long/3D/Gale/trunk/src/StGermain: .
Base/Container/tests Discretisation/Geometry/tests
Discretisation/Swarm/tests Viewers/MeshLayoutViewer/MLView src
walter at geodynamics.org
walter at geodynamics.org
Wed Jan 17 16:10:44 PST 2007
Author: walter
Date: 2007-01-17 16:10:43 -0800 (Wed, 17 Jan 2007)
New Revision: 5813
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Base/Container/tests/testLinkedListIterator.c
long/3D/Gale/trunk/src/StGermain/Base/Container/tests/testMaxHeap.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMath.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSingleCellLayout0.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvection.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testWithinShapeParticleLayout.c
long/3D/Gale/trunk/src/StGermain/Viewers/MeshLayoutViewer/MLView/MLView.c
long/3D/Gale/trunk/src/StGermain/src/main.c
Log:
r3304 at earth (orig r3972): WalterLandry | 2007-01-16 12:03:33 -0800
Fix C++ style comments
Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
- 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3971
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3972
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/tests/testLinkedListIterator.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/tests/testLinkedListIterator.c 2007-01-18 00:09:41 UTC (rev 5812)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/tests/testLinkedListIterator.c 2007-01-18 00:10:43 UTC (rev 5813)
@@ -151,7 +151,7 @@
Journal_Printf( myStream, "\nDeleting the List\n" );
Stg_Class_Delete( (void*)numList );
- //Adding because it seems missing ,though probably isn't
+ /* Adding because it seems missing ,though probably isn't */
for(i=0; i<NUM_DATA; i++)
Memory_Free(array[i]);
BaseContainer_Finalise();
Modified: long/3D/Gale/trunk/src/StGermain/Base/Container/tests/testMaxHeap.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Container/tests/testMaxHeap.c 2007-01-18 00:09:41 UTC (rev 5812)
+++ long/3D/Gale/trunk/src/StGermain/Base/Container/tests/testMaxHeap.c 2007-01-18 00:10:43 UTC (rev 5813)
@@ -70,7 +70,7 @@
void** extendArray( int newCount, void ***array )
{
assert( array );
- //TODO Check if this is executed by creating memory
+ /* TODO Check if this is executed by creating memory */
if( (*(int***)array = (int**)realloc(*array, newCount * sizeof( int* ))) == NULL ){
Journal_Firewall( 0, Journal_Register(ErrorStream_Type, "testMaxHeap"), "Memory allocation failed in '%s'!!\n Aborting..!!\n", __func__ );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMath.c 2007-01-18 00:09:41 UTC (rev 5812)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMath.c 2007-01-18 00:10:43 UTC (rev 5813)
@@ -411,10 +411,10 @@
Journal_Printf(stream, "\n/*************************************/\n");
Journal_Printf( stream, "Test function EigenvectorList_Sort\n");
- // Matrix that gives eigenvalues and vectors
- //| 1.000 1.000 2.000 |
- //| 1.000 2.000 1.000 |
- //| 2.000 1.000 1.000 |
+ /* Matrix that gives eigenvalues and vectors */
+ /* | 1.000 1.000 2.000 | */
+ /* | 1.000 2.000 1.000 | */
+ /* | 2.000 1.000 1.000 | */
Journal_Printf( stream, " 3-D\n");
eigenvectorList[0].eigenvalue = 4;
eigenvectorList[1].eigenvalue = -1;
@@ -455,9 +455,9 @@
Journal_Printf( stream, "2-D\n");
- // Matrix that gives eigenvalues and vectors
- //| 5.000 1.000 |
- //| 1.000 5.000 |
+ /* Matrix that gives eigenvalues and vectors */
+ /* | 5.000 1.000 | */
+ /* | 1.000 5.000 | */
eigenvectorList[0].eigenvalue = 6;
eigenvectorList[1].eigenvalue = 4;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c 2007-01-18 00:09:41 UTC (rev 5812)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c 2007-01-18 00:10:43 UTC (rev 5813)
@@ -58,9 +58,9 @@
MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
/* stout -> file redirect code */
- //stJournal->firewallProducesAssert = False;
- //Stream_RedirectFile(Journal_Register( Error_Type, "TensorMultMath"), "TensorMultMath.txt");
- //Stream_RedirectFile(stream, "TensorMultMath.txt");
+ /* stJournal->firewallProducesAssert = False; */
+ /* Stream_RedirectFile(Journal_Register( Error_Type, "TensorMultMath"), "TensorMultMath.txt"); */
+ /* Stream_RedirectFile(stream, "TensorMultMath.txt"); */
if( argc >= 2 ) {
@@ -736,7 +736,7 @@
nonSquareMatrixB = Memory_Alloc_2DArray(double, 4, 2, "NonSquareMatrixB" );
nonSquareMatrixAT = Memory_Alloc_2DArray(double, 4, 3, "NonSquareMatrixAT" );
nonSquareMatrixResult = Memory_Alloc_2DArray(double, 3, 2, "NonSquareMatrixResult" );
- //Matrix A
+ /* Matrix A */
nonSquareMatrixA[0][0] = 0; nonSquareMatrixA[1][0] = 4;
nonSquareMatrixA[0][1] = 1; nonSquareMatrixA[1][1] = 5;
nonSquareMatrixA[0][2] = 2; nonSquareMatrixA[1][2] = 6;
@@ -746,7 +746,7 @@
nonSquareMatrixA[2][1] = 9;
nonSquareMatrixA[2][2] = 10;
nonSquareMatrixA[2][3] = 11;
- //Matrix B
+ /* Matrix B */
nonSquareMatrixB[0][0] = 0; nonSquareMatrixB[1][0] = 2;
nonSquareMatrixB[0][1] = 1; nonSquareMatrixB[1][1] = 3;
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSingleCellLayout0.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSingleCellLayout0.c 2007-01-18 00:09:41 UTC (rev 5812)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSingleCellLayout0.c 2007-01-18 00:10:43 UTC (rev 5813)
@@ -171,7 +171,7 @@
DiscretisationShape_Finalise();
DiscretisationGeometry_Finalise();
- //Memory_Print_Leak();
+ /* Memory_Print_Leak(); */
Base_Finalise();
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvection.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvection.c 2007-01-18 00:09:41 UTC (rev 5812)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testSwarmParticleAdvection.c 2007-01-18 00:10:43 UTC (rev 5813)
@@ -72,7 +72,7 @@
return 2.0;
}
-// TODO: should be removed once we get saving of swarms onto disc context...
+/* TODO: should be removed once we get saving of swarms onto disc context... */
void SaveSwarms( void* context );
/** Global so other funcs can use */
@@ -207,7 +207,7 @@
}
if( rank == procToWatch ) {
- //Print( swarm, stream );
+ /* Print( swarm, stream ); */
}
Stg_Component_Build( context, 0 /* dummy */, False );
@@ -226,8 +226,8 @@
/* Delete stuff */
/* Deleting the component factory automatically deletes all components in it */
- // TODO: should the component factory be renamed a comp. manager? Since it deletes
- // components as well?
+ /* TODO: should the component factory be renamed a comp. manager? Since it deletes */
+ /* components as well? */
Stg_Class_Delete( cf );
/* Remaining registers etc that don't live on the context or anything */
Stg_Class_Delete( extensionMgr_Register );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testWithinShapeParticleLayout.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testWithinShapeParticleLayout.c 2007-01-18 00:09:41 UTC (rev 5812)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/tests/testWithinShapeParticleLayout.c 2007-01-18 00:10:43 UTC (rev 5813)
@@ -120,7 +120,7 @@
MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
stream = Journal_Register (Info_Type, "myStream");
- //Stream_RedirectFile_WithPrependedPath( stream, "output", "withinShapeParticleLayout.dat" );
+ /* Stream_RedirectFile_WithPrependedPath( stream, "output", "withinShapeParticleLayout.dat" ); */
if( argc >= 2 ) {
procToWatch = atoi( argv[1] );
Modified: long/3D/Gale/trunk/src/StGermain/Viewers/MeshLayoutViewer/MLView/MLView.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Viewers/MeshLayoutViewer/MLView/MLView.c 2007-01-18 00:09:41 UTC (rev 5812)
+++ long/3D/Gale/trunk/src/StGermain/Viewers/MeshLayoutViewer/MLView/MLView.c 2007-01-18 00:10:43 UTC (rev 5813)
@@ -85,7 +85,7 @@
void initGL(void)
{
-// GLfloat pda[3] = {0.0, 0.3, 0.0};
+/* GLfloat pda[3] = {0.0, 0.3, 0.0}; */
int i;
glClearColor(0.3, 0.3, 0.3, 1.0);
@@ -96,7 +96,7 @@
glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE);
glPointSize(5.0);
-// glPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, pda);
+/* glPointParameterfv(GL_POINT_DISTANCE_ATTENUATION, pda); */
fontBase = glGenLists(127);
for (i = 0; i < 127; i++)
@@ -392,7 +392,7 @@
glutDisplayFunc(displayHandler);
glutReshapeFunc(reshapeHandler);
glutKeyboardFunc(keyboardHandler);
-// glutSpecialFunc(specialHandler);
+/* glutSpecialFunc(specialHandler); */
glutMouseFunc(mouseHandler);
glutMotionFunc(motionHandler);
Modified: long/3D/Gale/trunk/src/StGermain/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/src/main.c 2007-01-18 00:09:41 UTC (rev 5812)
+++ long/3D/Gale/trunk/src/StGermain/src/main.c 2007-01-18 00:10:43 UTC (rev 5813)
@@ -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
More information about the cig-commits
mailing list