[cig-commits] r4893 - in long/3D/Gale/trunk/src/StgFEM: .
SLE/SystemSetup/src plugins/LevelSetPlugin plugins/MultiGrid
plugins/Output/FrequentOutput
walter at geodynamics.org
walter at geodynamics.org
Wed Oct 11 13:50:05 PDT 2006
Author: walter
Date: 2006-10-11 13:50:04 -0700 (Wed, 11 Oct 2006)
New Revision: 4893
Modified:
long/3D/Gale/trunk/src/StgFEM/
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c
long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c
long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.c
long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.c
Log:
r779 at earth: boo | 2006-10-11 13:49:34 -0700
r753 at earth (orig r632): KathleenHumble | 2006-08-31 00:47:56 -0700
changing all malloc, realloc, free and strdup into StGermain eqivalents.
Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
- 38867592-cf10-0410-9e16-a142ea72ac34:/cig:778
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:631
+ 38867592-cf10-0410-9e16-a142ea72ac34:/cig:779
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:632
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c 2006-10-11 20:50:02 UTC (rev 4892)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c 2006-10-11 20:50:04 UTC (rev 4893)
@@ -251,7 +251,7 @@
strcpy( newForceVector->_assembleForceVectorEPName + nameLen, nameExt );
}
else {
- newForceVector->_assembleForceVectorEPName = strdup( self->_assembleForceVectorEPName );
+ newForceVector->_assembleForceVectorEPName = StG_Strdup( self->_assembleForceVectorEPName );
}
}
else {
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c 2006-10-11 20:50:02 UTC (rev 4892)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c 2006-10-11 20:50:04 UTC (rev 4893)
@@ -274,7 +274,7 @@
dict = Dictionary_Entry_Value_AsDictionary( Dictionary_Get( cf->componentDict, self->name ) );
assert( dict );
- self->velVarName = strdup( Dictionary_Entry_Value_AsString( Dictionary_Get( dict, "velocityVariable" ) ) );
+ self->velVarName = StG_Strdup( Dictionary_Entry_Value_AsString( Dictionary_Get( dict, "velocityVariable" ) ) );
self->res = Dictionary_Entry_Value_AsInt( Dictionary_Get( dict, "resolution" ) );
self->fac = Dictionary_Entry_Value_AsInt( Dictionary_Get( dict, "scaleFactor" ) );
self->initDistDict = Dictionary_Entry_Value_AsDictionary( Dictionary_Get( dict, "initialDistance" ) );
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.c 2006-10-11 20:50:02 UTC (rev 4892)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.c 2006-10-11 20:50:04 UTC (rev 4893)
@@ -248,10 +248,10 @@
downIts[level_i] = Dictionary_GetUnsignedInt_WithDefault( levelEntry, "downIts", nAllDownIts );
upIts[level_i] = Dictionary_GetUnsignedInt_WithDefault( levelEntry, "upIts", nAllUpIts );
cycles[level_i] = Dictionary_GetUnsignedInt_WithDefault( levelEntry, "cycles", 1 );
- upSmoothers[level_i] = strdup( Dictionary_GetString_WithDefault( levelEntry,
+ upSmoothers[level_i] = StG_Strdup( Dictionary_GetString_WithDefault( levelEntry,
"upSmoother",
allUpSmoother ) );
- downSmoothers[level_i] = strdup( Dictionary_GetString_WithDefault( levelEntry,
+ downSmoothers[level_i] = StG_Strdup( Dictionary_GetString_WithDefault( levelEntry,
"downSmoother",
allDownSmoother ) );
}
@@ -260,15 +260,15 @@
downIts[level_i] = nAllDownIts;
upIts[level_i] = nAllUpIts;
cycles[level_i] = 1;
- upSmoothers[level_i] = strdup( allUpSmoother );
- downSmoothers[level_i] = strdup( allDownSmoother );
+ upSmoothers[level_i] = StG_Strdup( allUpSmoother );
+ downSmoothers[level_i] = StG_Strdup( allDownSmoother );
}
else {
downIts[level_i] = 1;
upIts[level_i] = 0;
cycles[level_i] = 1;
- upSmoothers[level_i] = strdup( "default" );
- downSmoothers[level_i] = strdup( "default" );
+ upSmoothers[level_i] = StG_Strdup( "default" );
+ downSmoothers[level_i] = StG_Strdup( "default" );
}
}
}
@@ -290,10 +290,10 @@
downIts[level_i] = Dictionary_GetUnsignedInt_WithDefault( levelEntry, "downIts", downIts[level_i] );
upIts[level_i] = Dictionary_GetUnsignedInt_WithDefault( levelEntry, "upIts", upIts[level_i] );
cycles[level_i] = Dictionary_GetUnsignedInt_WithDefault( levelEntry, "cycles", cycles[level_i] );
- upSmoothers[level_i] = strdup( Dictionary_GetString_WithDefault( levelEntry,
+ upSmoothers[level_i] = StG_Strdup( Dictionary_GetString_WithDefault( levelEntry,
"upSmoother",
upSmoothers[level_i] ) );
- downSmoothers[level_i] = strdup( Dictionary_GetString_WithDefault( levelEntry,
+ downSmoothers[level_i] = StG_Strdup( Dictionary_GetString_WithDefault( levelEntry,
"downSmoother",
downSmoothers[level_i] ) );
}
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.c 2006-10-11 20:50:02 UTC (rev 4892)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.c 2006-10-11 20:50:04 UTC (rev 4893)
@@ -169,10 +169,10 @@
stream = self->stream;
/* Print First Boarder with '#' in the front */
- firstBorderString = strdup( self->borderString );
+ firstBorderString = StG_Strdup( self->borderString );
firstBorderString[0] = '#';
Journal_Printf( stream, firstBorderString );
- free( firstBorderString );
+ Memory_Free( firstBorderString );
Journal_PrintString_WithLength( stream, "Timestep", self->columnWidth );
@@ -198,5 +198,3 @@
Journal_Printf( stream, "\n" );
}
-
-
More information about the cig-commits
mailing list