Merge 99269b9682 into c5ed2ad1e9

tutorials/sphereGranFlow/binarySystemOfParticles/settings/domainDict

@@ -21,19 +21,14 @@ decomposition
 boundaries
 {
 	// Determines how often (how many iterations) do you want to 
-
 	// rebuild the list of particles in the neighbor list 
-
 	// of all boundaries in the simulation domain 
-
 	neighborListUpdateInterval     50; 
 
 	// Determines how often do you want to update the new changes in the boundary
-
 	updateInterval                 10;
 
 	// The distance from the boundary plane within which particles are marked to be in the boundary list 
-
 	neighborLength              0.004;
 
 	left

tutorials/sphereGranFlow/binarySystemOfParticles/settings/particlesDict

@@ -10,7 +10,6 @@ setFields
 {
 	/*
 	    	Default value for fields defined for particles:
-
 		These fields should always be defined for simulations with spherical particles
 	*/
 

tutorials/sphereGranFlow/binarySystemOfParticles/settings/settingsDict

@@ -21,11 +21,8 @@ timePrecision  6;		                         // maximum number of digits for time
 g 	  (0 -9.8 0);          // gravity vector (m/s2) 
 
 // save necessary (i.e., required) data on disk
-
 includeObjects (diameter);                                                 
-
 // exclude unnecessary data from saving on disk
-
 excludeObjects (rVelocity.dy1 pStructPosition.dy1 pStructVelocity.dy1); 
 
 integrationMethod 		AdamsBashforth2; 	      // integration method 

tutorials/sphereGranFlow/layeredSiloFilling/caseSetup/interaction

@@ -32,7 +32,6 @@ model
    rollingFrictionModel normal;
 
    /*
-
    Property (lightMat-lightMat   lightMat-heavyMat    lightMat-wallMat
                                  heavyMat-heavyMat    heavyMat-wallMat
                                                       wallMat-wallMat );

tutorials/sphereGranFlow/layeredSiloFilling/settings/domainDict

@@ -16,19 +16,14 @@ globalBox                                        // Simulation domain: every par
 boundaries
 {
 	// Determines how often (how many iterations) do you want to 
-
 	// rebuild the list of particles in the neighbor list 
-
 	// of all boundaries in the simulation domain 
-
 	neighborListUpdateInterval 30;
 	
 	// Determines how often do you want to update the new changes in the boundary
-
 	updateInterval             10;
 
 	// The distance from the boundary plane within which particles are marked to be in the boundary list 
-
 	neighborLength          0.004;
 
 	left

tutorials/sphereGranFlow/layeredSiloFilling/settings/particlesDict

@@ -10,9 +10,7 @@ setFields
 {
 	/*
 	    	Default value for fields defined for particles
-
 		These fields should always be defined for simulations with 
-
 		spherical particles.
 	*/
 

tutorials/sphereGranFlow/layeredSiloFilling/settings/settingsDict

@@ -21,13 +21,9 @@ timePrecision         6;	                     // maximum number of digits for ti
 g 			 (0 0 -9.8);          // gravity vector (m/s2) 
 
 // save data objects that are not automatically saved on disk.
-
 // overrides the default behavior 
-
 includeObjects (diameter);                                                 
-
 // exclude unnecessary data from saving on disk
-
 excludeObjects (rVelocity.dy1 pStructPosition.dy1 pStructVelocity.dy1); 
 
 integrationMethod 		AdamsBashforth2; 	      // integration method