[Dda-cvs] ntdda/src mohrcoulomb.c,1.2,1.3

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31446

Modified Files:
	mohrcoulomb.c 
Log Message:
Reformat comments to match existing DDA code.

Index: mohrcoulomb.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/mohrcoulomb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mohrcoulomb.c	2 Jul 2006 23:08:21 -0000	1.2
--- mohrcoulomb.c	2 Jul 2006 23:12:25 -0000	1.3
***************
*** 6,19 ****
  #include "mohrcoulomb.h"
  
! /*   sigm:      mean stress invariant
! /*   dsbar:     deviatoric stress invariant
! /*	 fnew or f: value of failure function
! /*	 phi:       friction angle
! /*	 c:         cohesion
! /*	 psi:       dilation angle
! /*	 tnph:      tan(phi)
! /*	 snph:      sin(phi) 
! /*   theta:     lode angle
! */
    
  double sigm,dsbar,theta,cs[5],pl[5][5];
--- 6,19 ----
  #include "mohrcoulomb.h"
  
! /* sigm:      mean stress invariant
!  * dsbar:     deviatoric stress invariant
!  * fnew or f: value of failure function
!  * phi:       friction angle
!  * c:         cohesion
!  * psi:       dilation angle
!  * tnph:      tan(phi)
!  * snph:      sin(phi) 
!  * theta:     lode angle
!  */
    
  double sigm,dsbar,theta,cs[5],pl[5][5];
***************
*** 22,29 ****
  
  /*
! /*  first invariant "sigm", second invariant "dsbar" 
! /*  and lode angle "theta" for a stress tensor "stress"
! */ 
! 
  void invar()
  {
--- 22,28 ----
  
  /*
!  *  first invariant "sigm", second invariant "dsbar" 
!  *  and lode angle "theta" for a stress tensor "stress"
!  */ 
  void invar()
  {
***************
*** 55,63 ****
  
  /*
! /* Mohr-Coulomb yield function F from invariants "sigm"
! /* and "dsbar" lode angle "theta (radian) of friction "phi" 
! /* and cohesion "c"
! */
! 
  double mocouf(double c,double phi)
  {  
--- 54,61 ----
  
  /*
!  * Mohr-Coulomb yield function F from invariants "sigm"
!  * and "dsbar" lode angle "theta (radian) of friction "phi" 
!  * and cohesion "c"
!  */
  double mocouf(double c,double phi)
  {  
***************
*** 73,81 ****
  
  /*
! /* plastic stress-strain matrix "pl" from stresses "stress" 
! /* angle of friction "phi", dilation "psi" and elastic stiffness "E"
! /* ,"nu" for a Mohr-Coulomb material
! */
! 
  void mocopl(double phi,double psi,double nu, double ymod)
  {
--- 71,78 ----
  
  /*
!  * plastic stress-strain matrix "pl" from stresses "stress" 
!  * angle of friction "phi", dilation "psi" and elastic stiffness "E"
!  * ,"nu" for a Mohr-Coulomb material
!  */
  void mocopl(double phi,double psi,double nu, double ymod)
  {
***************
*** 159,165 ****
  
  /*
! /* main function in order to obtain the 
! /* correct stress using Mohr-Coulomb criteria
! */
  void mohrcoulomb(double c,double phi,double psi,double nu,double ymod,
  				 double eps[4],double * stress,double sigma[4])
--- 156,162 ----
  
  /*
!  * main function in order to obtain the 
!  * correct stress using Mohr-Coulomb criteria
!  */
  void mohrcoulomb(double c,double phi,double psi,double nu,double ymod,
  				 double eps[4],double * stress,double sigma[4])
***************
*** 186,188 ****
       
  	 for(i = 1; i <= 4; i++) stress[i+3] = stress[i+3] + sigma[i] - elso[i];
! }
\ No newline at end of file
--- 183,185 ----
       
  	 for(i = 1; i <= 4; i++) stress[i+3] = stress[i+3] + sigma[i] - elso[i];
! }