yade-dev team mailing list archive

Thread
Date

[Branch ~yade-dev/yade/trunk] Rev 1838: 1. Fix "rootBody" in FileGenerator saver.

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Tue, 01 Dec 2009 19:59:08 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 1838
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Tue 2009-12-01 20:57:36 +0100
message:
  1. Fix "rootBody" in FileGenerator saver.
modified:
  core/FileGenerator.cpp
  pkg/dem/PreProcessor/HydraulicTest.cpp
  pkg/dem/PreProcessor/ThreePointBending.cpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.

=== modified file 'core/FileGenerator.cpp'
--- core/FileGenerator.cpp	2008-12-08 09:17:00 +0000
+++ core/FileGenerator.cpp	2009-12-01 19:57:36 +0000
@@ -71,7 +71,7 @@
 		setProgress(1.0);
 		try
 		{
-			IOFormatManager::saveToFile(serializationDynlib, outputFileName, "rootBody", rootBody);
+			IOFormatManager::saveToFile(serializationDynlib, outputFileName, "world", rootBody);
 		}
 		catch(SerializableError& e)
 		{

=== modified file 'pkg/dem/PreProcessor/HydraulicTest.cpp'
--- pkg/dem/PreProcessor/HydraulicTest.cpp	2009-12-01 14:56:39 +0000
+++ pkg/dem/PreProcessor/HydraulicTest.cpp	2009-12-01 19:57:36 +0000
@@ -96,10 +96,10 @@
 		try
 		{
 			if ( filesystem::extension ( yadeFileWithSpheres ) ==".xml" )
-				IOFormatManager::loadFromFile ( "XMLFormatManager",yadeFileWithSpheres,"rootBody",metaBodyWithSpheres );
+				IOFormatManager::loadFromFile ( "XMLFormatManager",yadeFileWithSpheres,"world",metaBodyWithSpheres );
 
 			else if ( filesystem::extension ( yadeFileWithSpheres ) ==".yade" )
-				IOFormatManager::loadFromFile ( "BINFormatManager",yadeFileWithSpheres,"rootBody",metaBodyWithSpheres );
+				IOFormatManager::loadFromFile ( "BINFormatManager",yadeFileWithSpheres,"world",metaBodyWithSpheres );
 
 		if ( metaBodyWithSpheres->getClassName() != "World" ) { message="Error: cannot load the file that should contain spheres"; return false; }
 		}

=== modified file 'pkg/dem/PreProcessor/ThreePointBending.cpp'
--- pkg/dem/PreProcessor/ThreePointBending.cpp	2009-12-01 14:56:39 +0000
+++ pkg/dem/PreProcessor/ThreePointBending.cpp	2009-12-01 19:57:36 +0000
@@ -104,7 +104,7 @@
 	// load simulation file, extract spheres and use those
 	if (yadeFileWithSpheres.size()!=0){
 		shared_ptr<World> metaBodyWithSpheres;
-		IOFormatManager::loadFromFile("XMLFormatManager",yadeFileWithSpheres,"rootBody",metaBodyWithSpheres);
+		IOFormatManager::loadFromFile("XMLFormatManager",yadeFileWithSpheres,"world",metaBodyWithSpheres);
 		assert(metaBodyWithSpheres->getClassName()=="World");
 
 		FOREACH(shared_ptr<Body> b, *metaBodyWithSpheres->bodies){