Changeset 23 in TRACY3 for branches/tracy3-3.10.1b/tracy/tracy/src/tpsa_lin.cc

Timestamp:

Dec 6, 2013, 5:12:43 PM (10 years ago)

Author:

zhangj

Message:

Clean version of Tracy: SoleilVersion at the end of 2011.Use this clean version to find the correct dipole fringe field to have the correct FMAP and FMAPDP of ThomX. Modified files: tpsa_lin.cc, soleillib.cc, prtmfile.cc, rdmfile.cc, read_script.cc, physlib.cc, tracy.cc, t2lat.cc, t2elem.cc, naffutils.cc in /tracy/tracy/src folder; naffutils.h, tracy_global.h, physlib.h, tracy.h, read_script.h, solielilib.h, t2elem.h in /tracy/tracy.inc folder; soltracy.cc in tracy/tools folder

File:

• branches/tracy3-3.10.1b/tracy/tracy/src/tpsa_lin.cc (modified) (4 diffs)

branches/tracy3-3.10.1b/tracy/tracy/src/tpsa_lin.cc

@@ -414 +414 @@
 }
 
-/****************************
- * tan(x)
- * *************************/
+
 void datan(const tps_buf &x, tps_buf &z)
 {
@@ -424 +422 @@
 }
 
-/*************************
- *  cotan(x)
- * ***********************/
-void dactan(const tps_buf &x, tps_buf &z)
-{
-  tps_buf  c, s;
-
-  dacos(x, c); dasin(x, s); dadiv_(c, s, z);
-}
-
-/*************************************
- * 
- * Purpose:
- *     Get the derivatives of the arcsin(x)
- *    
- *    d(arcsin(u))/dx = (1/sqrt(1-u^2))*du/dx;
- * 
- *  Input:
- *         x: u
- *  Output: 
- *        z: the differential of x.
- *
- *       
- * Comments:
- *           13/11/2012
- *          Written by Jianfeng Nadolski @ LAL 
- *                      
- * ***********************************/
-void daarcsin(const tps_buf &x, tps_buf &z)
-{
-  int     i;
-  double  a;  //differential of x; a = sqrt(1/1-u^2)
-
-  a = x[0]; z[0] = asin(a); a = 1.0/sqrt(1.0-sqr(a));
-  for (i = 1; i <= ss_dim; i++)
-    z[i] = a*x[i];
-}
-
-/*************************************
- * 
- * Purpose:
- *     Get the derivatives of the arccos(x)
- *    
- *    d(arccos(u))/dx = -(1/sqrt(1-u^2))*du/dx;
- * 
- *  Input:
- *         x: u
- *  Output: 
- *        z: the differential of x.
- *
- *       
- * Comments:
- *           13/11/2012
- *          Written by Jianfeng Nadolski @ LAL 
- *                      
- * ***********************************/
-void daarccos(const tps_buf &x, tps_buf &z)
-{
-int     i;
-  double  a;  //differential of x; a = -sqrt(1/1-u^2)
-
-  a = x[0]; z[0] = asin(a); a = -1.0/sqrt(1.0-sqr(a));
-  for (i = 1; i <= ss_dim; i++)
-    z[i] = a*x[i];
-  
-}
-/*************************************
- * 
- * Purpose:
- *     Get the derivatives of the arctan(x)
- *    
- *    d(arctan(u))/dx = (1/1+u^2)*du/dx;
- * 
- *  Input:
- *         x: u
- *  Output: 
- *        z: the differential of x.
- *
- *         
- * ***********************************/
+
 void daarctan(const tps_buf &x, tps_buf &z)
 {
   int     i;
-  double  a;  //differential of x; a = (1/1+u^2)
+  double  a;
 
   a = x[0]; z[0] = atan(a); a = 1.0/(1.0+sqr(a));
@@ -514 +433 @@
 }
 
-/*************************************
- * 
- * Purpose:
- *     Get the derivatives of the arcctan(x)
- *    
- *    d(arcctan(u))/dx = -(1/1+u^2)*du/dx;
- * 
- *  Input:
- *         x: u
- *  Output: 
- *        z: the differential of x.
- *
- *         
- * ***********************************/
-void daarcctan(const tps_buf &x, tps_buf &z)
-{
-  int     i;
-  double  a;  //differential of x; a = -(1/1+u^2)
-
-  a = x[0]; z[0] = atan(a); a = -1.0/(1.0+sqr(a));
-  for (i = 1; i <= ss_dim; i++)
-    z[i] = a*x[i];
-}
 
 void dafun_(const char *fun, const tps_buf &x, tps_buf &z)
 {
   tps_buf  u;
-  
+
   if (!strncmp(fun, "INV ", dafunlen))
     dainv_(x, u);
@@ -554 +450 @@
   else if (!strncmp(fun, "COS ", dafunlen))
     dacos(x, u);
-  else if (!strncmp(fun, "TAN ", dafunlen))
-    datan(x, u);
-  else if (!strncmp(fun, "CTAN ", dafunlen))
-    dactan(x, u);
   else if (!strncmp(fun, "SINH ", dafunlen))
     dasinh(x, u);
   else if (!strncmp(fun, "COSH ", dafunlen))
     dacosh(x, u);
-  else if (!strncmp(fun, "ASIN", dafunlen))
-    daarcsin(x, u);
-  else if (!strncmp(fun, "ACOS", dafunlen))
-    daarccos(x, u);
+  else if (!strncmp(fun, "TAN ", dafunlen))
+    datan(x, u);
   else if (!strncmp(fun, "ATAN", dafunlen))
     daarctan(x, u);
-  else if (!strncmp(fun, "ACTAN", dafunlen))
-    daarcctan(x, u);
   else {
     printf("dafun: illegal function %s\n", fun);