From 23660cac61e6ba6d2e8ba38aa47907505282ddbe Mon Sep 17 00:00:00 2001
From: nadolski <nadolski@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Mon, 6 Dec 2010 08:10:01 +0000
Subject: [PATCH] minor fixes
---
tracy/tools/soltracy.cc | 2 +-
tracy/tracy/src/nsls-ii_lib.cc | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/tracy/tools/soltracy.cc b/tracy/tools/soltracy.cc
index af048af..6b275d2 100644
--- a/tracy/tools/soltracy.cc
+++ b/tracy/tools/soltracy.cc
@@ -50,7 +50,7 @@ int main(int argc, char *argv[]) {
if (argc > 1) {
read_script(argv[1], true);
} else {
- fprintf(stdout, "Not enough parameters\nSyntax is program parameterfile\n");
+ fprintf(stdout, "Not enough parameters\nSyntax is program parameter file\n");
exit_(1);
}
diff --git a/tracy/tracy/src/nsls-ii_lib.cc b/tracy/tracy/src/nsls-ii_lib.cc
index cc3df37..2eae6cb 100644
--- a/tracy/tracy/src/nsls-ii_lib.cc
+++ b/tracy/tracy/src/nsls-ii_lib.cc
@@ -5,7 +5,7 @@
T. Shaftan, I. Pinayev, Y. Luo, C. Montag, B. Nash
*/
-/* Current revision $Revision: 1.9 $
+/* Current revision $Revision: 1.10 $
On branch $Name: not supported by cvs2svn $
Latest change by $Author: nadolski $
*/
@@ -4863,7 +4863,7 @@ void get_alphac2(void)
dependent fixed point. */
const int n_points = 5;
- const double d_delta = 2e-2;
+ const double d_delta = 1e-3;
int i, j, n;
long int lastpos;
@@ -4882,14 +4882,12 @@ void get_alphac2(void)
x[j] = 0.0;
x[delta_] = delta[n-1];
Cell_Pass(0, globval.Cell_nLoc, x, lastpos);
- alphac[n-1] = x[ct_]/Cell.S;
+ alphac[n-1] = x[ct_]/Cell.S; // this is not mcf but DT/T
}
pol_fit(n, delta, alphac, 3, b, sigma);
- printf("Momentum compact factor:\n");
- printf(" alphac = %10.3e + %10.3e*delta + %10.3e*delta^2\n",
+ printf("Momentum compaction factor:\n");
+ printf(" alpha1 = %10.3e alpha2 = %10.3e alpha3 = %10.3e\n",
b[1], b[2], b[3]);
- printf(" alpha1 = %10.3e alpha2 = %10.3e alpha3= %10.3e\n\n",
- b[1], b[2]/2, b[3]/3);
}
--
GitLab