← Back to team overview

yade-dev team mailing list archive

[svn] r1493 - in trunk: core pkg/lattice/Engine/StandAloneEngine pkg/lattice/PreProcessor

 

Author: cosurgi
Date: 2008-08-23 01:01:31 +0200 (Sat, 23 Aug 2008)
New Revision: 1493

Modified:
   trunk/core/yade.cpp
   trunk/pkg/lattice/Engine/StandAloneEngine/LatticeLaw.cpp
   trunk/pkg/lattice/Engine/StandAloneEngine/StrainRecorder.cpp
   trunk/pkg/lattice/PreProcessor/LatticeExample.cpp
   trunk/pkg/lattice/PreProcessor/LatticeExample.hpp
Log:
yade.cpp: more detailed info about compilation flags.
LatticeExample: added material parameters bond zone between steel fibres and cement matrix



Modified: trunk/core/yade.cpp
===================================================================
--- trunk/core/yade.cpp	2008-08-21 22:21:27 UTC (rev 1492)
+++ trunk/core/yade.cpp	2008-08-22 23:01:31 UTC (rev 1493)
@@ -111,8 +111,11 @@
 	flags=flags+"   PREFIX=" PREFIX  "\n";
 	flags=flags+"   SUFFIX=" SUFFIX "\n";
 	#ifdef YADE_DEBUG
-		flags+="   DEBUG";
+		flags+="   YADE_DEBUG (debug information)\n";
 	#endif
+	#ifdef NDEBUG
+		flags+="   NDEBUG (heavy optimizations, static_casts everywhere, asserts() are no-ops)\n";
+	#endif
 	cerr << 
 "\n" << Omega::instance().yadeVersionName << "\n\
 \n\
@@ -177,7 +180,7 @@
 		}
 	#endif
 
-	Omega::instance().yadeVersionName = "Yet Another Dynamic Engine 0.11.x, beta, SVN snapshot.";
+	Omega::instance().yadeVersionName = "Yet Another Dynamic Engine 0.12.x, beta, SVN snapshot.";
 	Omega::instance().preferences    = shared_ptr<Preferences>(new Preferences);
 	Omega::instance().yadeConfigPath = configPath; 
 	filesystem::path yadeConfigPath  = filesystem::path(Omega::instance().yadeConfigPath, filesystem::native);

Modified: trunk/pkg/lattice/Engine/StandAloneEngine/LatticeLaw.cpp
===================================================================
--- trunk/pkg/lattice/Engine/StandAloneEngine/LatticeLaw.cpp	2008-08-21 22:21:27 UTC (rev 1492)
+++ trunk/pkg/lattice/Engine/StandAloneEngine/LatticeLaw.cpp	2008-08-22 23:01:31 UTC (rev 1493)
@@ -288,7 +288,7 @@
 		{ // 'E_min' 'E_max' criterion
 			if( deleteBeam(lattice , beam, body) ) // calculates strain
 			{
-				//std::cerr << "one beam deleted\n";
+				std::cerr << "one beam deleted\n";
 				futureDeletes.push_back(body->getId());
 				continue;
 			}

Modified: trunk/pkg/lattice/Engine/StandAloneEngine/StrainRecorder.cpp
===================================================================
--- trunk/pkg/lattice/Engine/StandAloneEngine/StrainRecorder.cpp	2008-08-21 22:21:27 UTC (rev 1492)
+++ trunk/pkg/lattice/Engine/StandAloneEngine/StrainRecorder.cpp	2008-08-22 23:01:31 UTC (rev 1493)
@@ -29,7 +29,8 @@
 	//	outputFile += "_"+boost::lexical_cast<std::string>(Omega::instance().getTimeStep());
 	//	std::cerr << "using dt for StrainRecorder output file: " << outputFile << "\n";
 
-		ofile.open(outputFile.c_str());
+		//ofile.open(outputFile.c_str());
+		ofile.open(outputFile.c_str(), std::ios::app);
 
 	}
 }

Modified: trunk/pkg/lattice/PreProcessor/LatticeExample.cpp
===================================================================
--- trunk/pkg/lattice/PreProcessor/LatticeExample.cpp	2008-08-21 22:21:27 UTC (rev 1492)
+++ trunk/pkg/lattice/PreProcessor/LatticeExample.cpp	2008-08-22 23:01:31 UTC (rev 1493)
@@ -198,6 +198,12 @@
 	fibre_allows		 = 0.5;
 	fibre_irregularity_noUnit= 5;
 	fibre_balancing_iterations= 300;
+        // MaterialParameters of fibre bond
+        fibre_bond_longStiffness_noUnit= 0.7;         // k_l fibre bond
+        fibre_bond_bendStiffness_noUnit= 0.28;        // k_b fibre bond
+        fibre_bond_torsStiffness_noUnit= 0.28;        // k_t fibre bond
+        fibre_bond_critCompressStrain  = 100.0;       // E.c fibre bond
+        fibre_bond_critTensileStrain   = 50.0;        // E.l fibre bond
 		
 	nodeRec_A_min=Vector3r(0,0,0);
 	nodeRec_A_max=Vector3r(0,0,0);
@@ -431,6 +437,12 @@
 	REGISTER_ATTRIBUTE(fibre_allows);
 	REGISTER_ATTRIBUTE(fibre_irregularity_noUnit);
 	REGISTER_ATTRIBUTE(fibre_balancing_iterations);
+        // MaterialParameters of fibre bond
+        REGISTER_ATTRIBUTE(fibre_bond_longStiffness_noUnit);  // k_l fibre bond
+        REGISTER_ATTRIBUTE(fibre_bond_bendStiffness_noUnit);  // k_b fibre bond
+        REGISTER_ATTRIBUTE(fibre_bond_torsStiffness_noUnit);  // k_t fibre bond
+        REGISTER_ATTRIBUTE(fibre_bond_critCompressStrain);    // E.c fibre bond
+        REGISTER_ATTRIBUTE(fibre_bond_critTensileStrain);     // E.l fibre bond
 }
 
 bool LatticeExample::generate()
@@ -1788,11 +1800,11 @@
 			}
 			if(fibreNodes==1) // bond
 			{
-                                beam->longitudalStiffness       = bond_longStiffness_noUnit;
-                                beam->bendingStiffness          = bond_bendStiffness_noUnit;
-                                beam->torsionalStiffness	= bond_torsStiffness_noUnit;
-                                beam->criticalTensileStrain     = bond_critTensileStrain;
-                                beam->criticalCompressiveStrain = bond_critCompressStrain;
+                                beam->longitudalStiffness       = fibre_bond_longStiffness_noUnit;
+                                beam->bendingStiffness          = fibre_bond_bendStiffness_noUnit;
+                                beam->torsionalStiffness	= fibre_bond_torsStiffness_noUnit;
+                                beam->criticalTensileStrain     = fibre_bond_critTensileStrain;
+                                beam->criticalCompressiveStrain = fibre_bond_critCompressStrain;
 			}
                 }
         }

Modified: trunk/pkg/lattice/PreProcessor/LatticeExample.hpp
===================================================================
--- trunk/pkg/lattice/PreProcessor/LatticeExample.hpp	2008-08-21 22:21:27 UTC (rev 1492)
+++ trunk/pkg/lattice/PreProcessor/LatticeExample.hpp	2008-08-22 23:01:31 UTC (rev 1493)
@@ -84,6 +84,12 @@
 				,fibre_allows
 				,fibre_irregularity_noUnit
 				,fibre_balancing_iterations
+                        // MaterialParameters of fibre bond
+                                ,fibre_bond_longStiffness_noUnit      // k_l fibre bond
+                                ,fibre_bond_bendStiffness_noUnit      // k_b fibre bond
+                                ,fibre_bond_torsStiffness_noUnit      // k_t fibre bond
+                                ,fibre_bond_critCompressStrain        // E.c fibre bond
+                                ,fibre_bond_critTensileStrain         // E.l fibre bond
 				
 				,fibres_total
 				,matrix_total