[cig-commits] r4831 - in long/3D/Gale/trunk/src/StGermain: .
Discretisation/Mesh/src
walter at geodynamics.org
walter at geodynamics.org
Wed Oct 11 13:46:26 PDT 2006
Author: walter
Date: 2006-10-11 13:46:25 -0700 (Wed, 11 Oct 2006)
New Revision: 4831
Modified:
long/3D/Gale/trunk/src/StGermain/
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CommTopology.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync.c
long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.c
Log:
r2888 at earth: boo | 2006-10-11 13:42:32 -0700
r2804 at earth (orig r3792): KathleenHumble | 2006-09-11 17:57:54 -0700
Changing the typedef Byte
to the new definition Stg_Byte
in the files in Discretisation/Mesh
Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
- 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2887
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3791
+ 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2888
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3792
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CommTopology.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CommTopology.c 2006-10-11 20:46:24 UTC (rev 4830)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/CommTopology.c 2006-10-11 20:46:25 UTC (rev 4831)
@@ -258,7 +258,7 @@
MPI_Status status;
unsigned* nbrSizes;
unsigned* tmpSizes;
- Byte** nbrArrays;
+ Stg_Byte** nbrArrays;
unsigned p_i;
assert( self );
@@ -283,7 +283,7 @@
}
/* Allocate space for results. */
- nbrArrays = Memory_Alloc_2DComplex_Unnamed( Byte, self->nInc, tmpSizes );
+ nbrArrays = Memory_Alloc_2DComplex_Unnamed( Stg_Byte, self->nInc, tmpSizes );
/* Transfer arrays. */
for( p_i = 0; p_i < self->nInc; p_i++ ) {
@@ -313,7 +313,7 @@
MPI_Status status;
unsigned* nbrSizes;
unsigned* tmpSizes;
- Byte** nbrArrays;
+ Stg_Byte** nbrArrays;
unsigned p_i;
assert( self );
@@ -339,7 +339,7 @@
}
/* Allocate space for results. */
- nbrArrays = Memory_Alloc_2DComplex_Unnamed( Byte, self->nInc, tmpSizes );
+ nbrArrays = Memory_Alloc_2DComplex_Unnamed( Stg_Byte, self->nInc, tmpSizes );
/* Transfer arrays. */
for( p_i = 0; p_i < self->nInc; p_i++ ) {
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp.c 2006-10-11 20:46:24 UTC (rev 4830)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp.c 2006-10-11 20:46:25 UTC (rev 4831)
@@ -289,7 +289,7 @@
void Decomp_ValidateDomain( Decomp* self, unsigned* status ) {
unsigned rank, nProcs;
unsigned nBytes;
- Byte* bytes;
+ Stg_Byte* bytes;
unsigned tag = 6669;
RangeSet* lSet;
RangeSet* gSet;
@@ -316,7 +316,7 @@
MPI_Status mpiStatus;
MPI_Recv( &nBytes, 1, MPI_UNSIGNED, rank - 1, tag, self->comm, &mpiStatus );
- bytes = Memory_Alloc_Array_Unnamed( Byte, nBytes );
+ bytes = Memory_Alloc_Array_Unnamed( Stg_Byte, nBytes );
MPI_Recv( bytes, nBytes, MPI_BYTE, rank - 1, tag, self->comm, &mpiStatus );
RangeSet_Unpickle( gSet, nBytes, bytes );
FreeArray( bytes );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync.c 2006-10-11 20:46:24 UTC (rev 4830)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync.c 2006-10-11 20:46:25 UTC (rev 4831)
@@ -488,9 +488,9 @@
/* Only continue if we're part of the sub-communicator. */
if( rank >= p_i ) {
unsigned nBytes;
- Byte* bytes;
+ Stg_Byte* bytes;
unsigned* nFounds;
- Byte** founds;
+ Stg_Byte** founds;
/* Create a mapping between ranks. */
for( p_j = p_i; p_j < nProcs; p_j++ )
@@ -501,7 +501,7 @@
if( p_i == rank )
RangeSet_Pickle( lSet, &nBytes, &bytes );
- MPIArray_Bcast( &nBytes, (void**)&bytes, sizeof(Byte), subRanks[p_i], subComm );
+ MPIArray_Bcast( &nBytes, (void**)&bytes, sizeof(Stg_Byte), subRanks[p_i], subComm );
if( p_i != rank ) {
/* Create the intersection. */
@@ -659,8 +659,8 @@
unsigned rank;
unsigned nInc;
unsigned* inc;
- Byte* snkArray;
- Byte* srcArray;
+ Stg_Byte* snkArray;
+ Stg_Byte* srcArray;
unsigned p_i;
/* Sanity checks. */
@@ -676,10 +676,10 @@
if( self->netSnks > 0 ) {
unsigned snk_i;
- snkArray = Memory_Alloc_Array_Unnamed( Byte, self->netSnks * array->itemSize );
+ snkArray = Memory_Alloc_Array_Unnamed( Stg_Byte, self->netSnks * array->itemSize );
for( snk_i = 0; snk_i < self->netSnks; snk_i++ ) {
memcpy( snkArray + snk_i * array->itemSize,
- (Byte*)array->snkArray + array->snkOffs[snk_i],
+ (Stg_Byte*)array->snkArray + array->snkOffs[snk_i],
array->itemSize );
}
}
@@ -688,7 +688,7 @@
/* Allocate for sources. */
if( self->netSrcs > 0 )
- srcArray = Memory_Alloc_Array_Unnamed( Byte, self->netSrcs * array->itemSize );
+ srcArray = Memory_Alloc_Array_Unnamed( Stg_Byte, self->netSrcs * array->itemSize );
else
srcArray = NULL;
@@ -720,7 +720,7 @@
unsigned src_i;
for( src_i = 0; src_i < self->netSrcs; src_i++ ) {
- memcpy( (Byte*)array->srcArray + array->srcOffs[src_i],
+ memcpy( (Stg_Byte*)array->srcArray + array->srcOffs[src_i],
srcArray + src_i * array->itemSize,
array->itemSize );
}
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.c 2006-10-11 20:46:24 UTC (rev 4830)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/Decomp_Sync_Claim.c 2006-10-11 20:46:25 UTC (rev 4831)
@@ -199,7 +199,7 @@
unsigned nInc;
unsigned* inc;
unsigned nBytes;
- Byte* bytes;
+ Stg_Byte* bytes;
RangeSet* tmpClaimed;
unsigned tag = 6669;
unsigned p_i, p_j;
@@ -222,7 +222,7 @@
/* Receive from neighbour which indices it has taken. */
MPI_Recv( &nBytes, 1, MPI_UNSIGNED, inc[p_i], tag, topo->comm, &status );
- bytes = Memory_Alloc_Array_Unnamed( Byte, nBytes );
+ bytes = Memory_Alloc_Array_Unnamed( Stg_Byte, nBytes );
MPI_Recv( bytes, nBytes, MPI_BYTE, inc[p_i], tag, topo->comm, &status );
RangeSet_Unpickle( tmpClaimed, nBytes, bytes );
FreeArray( bytes );
More information about the cig-commits
mailing list