[cig-commits] r4317 - in long/3D/Gale/trunk/src/StGermain: . Discretisation/Geometry/src Discretisation/Geometry/tests

[walter at geodynamics.org]

Author: walter
Date: 2006-08-17 17:16:42 -0700 (Thu, 17 Aug 2006)
New Revision: 4317

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.h
   long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c
Log:
 r2695 at earth:  boo | 2006-08-17 17:14:14 -0700
  r2649 at earth (orig r3730):  KathleenHumble | 2006-07-31 01:00:45 -0700
  --Removing commented out functions:
  SymmetricTensor_PullbackDeviator and
  SymmetricTensor_PullbackTrace
  as having them in there as is would create 
  strange results in doxygen
  
  --removed unused ariable in testTensorMultMath
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2694
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3729
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:2695
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3730

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c	2006-08-18 00:16:39 UTC (rev 4316)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.c	2006-08-18 00:16:42 UTC (rev 4317)
@@ -498,68 +498,3 @@
 
     return contraction;
 }
-
-/** Calculate pull-back of the trace operator in spatial coordinates using Right Cauchy Green SymmetricTensor 
-See reference :
-For Right Cauchy-Green Tensor
-http://www.answers.com/topic/finite-deformation-tensors
-For Pullback:
-http://mathworld.wolfram.com/PullbackMap.html ,
-http://www.answers.com/topic/cotangent-space
-For Trace:
-http://mathworld.wolfram.com/TensorTrace.html
-*/
-
-//double SymmetricTensor_PullbackTrace(SymmetricTensor tensorA, SymmetricTensor RC, Dimension_Index dim) {
-
-	/** \[TR[\cdot]:=[\cdot]:C\] (scalar) */
-	/** NB. RC ~ Right Cauchy-Green tensor */
-/*    double contraction;
-	contraction = SymmetricTensor_DoubleContraction(tensorA, RC, dim);
-    return contraction;
-}
-*/
-/** Calculate pull-back of the deviator operator in spatial coordinates using Right Cauchy Green SymmetricTensor 
-See reference:
-http://www.answers.com/topic/finite-deformation-tensors
-*/
-/*
-void SymmetricTensor_PullbackDeviator(	SymmetricTensor symmetricTensor, SymmetricTensor RC, Dimension_Index dim, SymmetricTensor result) 
-{
-*/
-	/** \[DEV[\cdot]:=(\cdot)-\frac{1}{3}[C:(\cdot)]C^{-1}\] (SymmetricTensor) */
-/*    
-	double              contraction;
-    Dimension_Index     i;
-    TensorArray         tempTensor, tempTensor2;
-    SymmetricTensor     RCi;
-
-    contraction = SymmetricTensor_DoubleContraction(RC, symmetricTensor, dim);
-*/
-    /* calculating inverse of right cauchy green tensor */
-/*    StGermain_SymmetricTensor_ToTensorArray( RC, dim, tempTensor );
-    TensorArray_CalcInverse( tempTensor, dim, tempTensor2 );
-    TensorArray_GetSymmetricPart( tempTensor2, dim, RCi );
-
-    switch (dim) {
-        case 3:
-            for (i=0; i < 2 * dim; ++i){
-                result[i] = symmetricTensor[i] - (contraction * RCi[i])/3.0;
-            }
-            return;
-        case 2:
-            for (i=0; i <  dim + 1; ++i){
-                result[i] = symmetricTensor[i] - (contraction * RCi[i])/3.0;
-            }
-            return;
-        default: {
-			Stream* error = Journal_Register( ErrorStream_Type, "TensorMultMath" );
-			Journal_Printf( error, "Cannot get tensor value for dimension %d in %s.\n", dim, __func__);
-			Journal_Firewall( dim, error,
-				"In func '%s' don't understand dim = %u\n", __func__, dim );
-            }
-    }
-
-	return; 
-}
-*/

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.h	2006-08-18 00:16:39 UTC (rev 4316)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/src/TensorMultMath.h	2006-08-18 00:16:42 UTC (rev 4317)
@@ -75,8 +75,6 @@
 /* Useful operations in Solid Mechanics */
 double TensorArray_DoubleContraction(TensorArray tensorArrayA,TensorArray tensorArrayB, Dimension_Index dim);
 double SymmetricTensor_DoubleContraction(SymmetricTensor tensorA, SymmetricTensor tensorB, Dimension_Index dim);
-//double SymmetricTensor_PullbackTrace(SymmetricTensor tensorArrayA, SymmetricTensor RC, Dimension_Index dim);
-//void SymmetricTensor_PullbackDeviator(	SymmetricTensor symmetricTensor, SymmetricTensor RC,
-//										Dimension_Index dim, SymmetricTensor result);
 
+
 #endif /* __Discretisation_Geometry_TensorMultMath_h__ */

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c	2006-08-18 00:16:39 UTC (rev 4316)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Geometry/tests/testTensorMultMath.c	2006-08-18 00:16:42 UTC (rev 4317)
@@ -75,7 +75,7 @@
 		SymmetricTensor symmTensor, symmTensor2, symmTensorResult;
 		TensorArray     tensorArray, tensorArray2, tensorResult, tensorCompare, tensorDiff;
 		XYZ 	vector, vectorResult;
-		double result, resultCompare, errorValue;
+		double result, errorValue;
 		Dimension_Index row, col;
 		Bool tensorMultMathTest_Flag;
 		#define STG_TENSORMULTMATHTEST_ERROR 1.0e-14;