yade-dev team mailing list archive

[jduriez at BerliOS <jduriez@xxxxxxxxxxxxxxx>]

Author: jduriez
Date: 2009-02-13 16:45:59 +0100 (Fri, 13 Feb 2009)
New Revision: 1665

Modified:
   trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.cpp
   trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.hpp
   trunk/pkg/dem/DataClass/InteractionPhysics/ElasticContactInteraction.hpp
Log:
- Correction of the headers of two files "ContactLaw1Interaction" which were commited by me and not by Bruno
- Some features of ContactLaw1Interaction were declared in ElasticContactInteraction. This was a mistake totally not planned (and the fact it was in svn also was not
noticed) and is now corrected


Modified: trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.cpp	2009-02-11 11:32:56 UTC (rev 1664)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.cpp	2009-02-13 15:45:59 UTC (rev 1665)
@@ -1,6 +1,6 @@
 /*************************************************************************
-*  Copyright (C) 2007 by Bruno Chareyre                                 *
-*  bruno.chareyre@xxxxxxx                                               *
+*  Copyright (C) 2008 by Jérôme DURIEZ                                   *
+*  duriez@xxxxxxxxxxxxxxx                                                *
 *                                                                        *
 *  This program is free software; it is licensed under the terms of the  *
 *  GNU General Public License v2 or later. See file LICENSE for details. *

Modified: trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.hpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.hpp	2009-02-11 11:32:56 UTC (rev 1664)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.hpp	2009-02-13 15:45:59 UTC (rev 1665)
@@ -1,6 +1,6 @@
 /*************************************************************************
-*  Copyright (C) 2007 by Bruno Chareyre                                 *
-*  bruno.chareyre@xxxxxxx                                               *
+*  Copyright (C) 2008 by Jérôme DURIEZ                                   *
+*  duriez@xxxxxxxxxxxxxxx                                                *
 *                                                                        *
 *  This program is free software; it is licensed under the terms of the  *
 *  GNU General Public License v2 or later. See file LICENSE for details. *

Modified: trunk/pkg/dem/DataClass/InteractionPhysics/ElasticContactInteraction.hpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/ElasticContactInteraction.hpp	2009-02-11 11:32:56 UTC (rev 1664)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/ElasticContactInteraction.hpp	2009-02-13 15:45:59 UTC (rev 1665)
@@ -13,10 +13,7 @@
 				,initialEquilibriumDistance	// initial equilibrium distance
 				,frictionAngle 			// angle of friction, according to Coulumb criterion
 				,tangensOfFrictionAngle
-				,unMax		// the maximum value of penetration depth of the history of this interaction
-				,previousun	// the value of this un at the last time step
-				,previousFn;	// the value of the normal force at the last time step
-	
+				;	
 		Vector3r	prevNormal;			// unit normal of the contact plane.
 
 		ElasticContactInteraction();