From 9f52014d735a70191f480e58ef02340adaa5b0d1 Mon Sep 17 00:00:00 2001 From: nemu Date: Tue, 17 Aug 2010 09:24:09 +0000 Subject: [PATCH] some more comments --- src/tests/nonlocal/In_37_T2P83_E14P1.inp | 4 ++-- src/tests/nonlocal/Makefile | 2 +- src/tests/nonlocal/PPippard.cpp | 12 +++++++----- src/tests/nonlocal/nonlocal.cpp | 10 +++++----- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/tests/nonlocal/In_37_T2P83_E14P1.inp b/src/tests/nonlocal/In_37_T2P83_E14P1.inp index bca90639..337c3242 100644 --- a/src/tests/nonlocal/In_37_T2P83_E14P1.inp +++ b/src/tests/nonlocal/In_37_T2P83_E14P1.inp @@ -16,10 +16,10 @@ reducedTemp = 0.8492 lambdaL = 30.4 xi0 = 380.0 meanFreePath = 12000.0 -filmThickness = 500000.0 +filmThickness = 300000.0 specular = 1 Bext = 41.19 deadLayer = 5.76 -rgeFileName = /afs/psi.ch/project/nemu/analysis/2009/Nonlocal/trimsp/InSne141.rge +%rgeFileName = /afs/psi.ch/project/nemu/analysis/2009/Nonlocal/trimsp/InSne141.rge outputFileName = In_37_T2P83_E14P1.dat diff --git a/src/tests/nonlocal/Makefile b/src/tests/nonlocal/Makefile index bae852ff..fab8d160 100644 --- a/src/tests/nonlocal/Makefile +++ b/src/tests/nonlocal/Makefile @@ -40,7 +40,7 @@ CXXFLAGS = -O3 -Wall -fPIC PMUSRPATH = ./include MNPATH = $(ROOTSYS)/include GSLPATH = /usr/include/gsl -EIGEN2PATH = /usr/local/include/eigen2 +EIGEN2PATH = /opt/eigen INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(EIGEN2PATH) LD = g++ LDFLAGS = -O diff --git a/src/tests/nonlocal/PPippard.cpp b/src/tests/nonlocal/PPippard.cpp index de4908a3..cfddf1fe 100644 --- a/src/tests/nonlocal/PPippard.cpp +++ b/src/tests/nonlocal/PPippard.cpp @@ -380,16 +380,18 @@ void PPippard::SaveField() fprintf(fp, "%% Header ------------------------------------\n"); fprintf(fp, "%% Parameters:\n"); fprintf(fp, "%% Reduced Temperature = %lf\n", fParams.t); - fprintf(fp, "%% LambdaL(0) = %lf, LambdaL(t) = %lf\n", fParams.lambdaL, LambdaL_T(fParams.t)); + fprintf(fp, "%% LambdaL(0) = %lf (nm), LambdaL(t) = %lf (nm)\n", fParams.lambdaL, LambdaL_T(fParams.t)); if (fParams.specularIntegral > 0.0) - fprintf(fp, "%% int_x=0^infty B(x) dx / Bext = %lf\n", fParams.specularIntegral); - fprintf(fp, "%% xiP(0) = %lf, xiP(t) = %lf\n", fParams.xi0, XiP_T(fParams.t)); - fprintf(fp, "%% Mean Free Path = %lf\n", fParams.meanFreePath); - fprintf(fp, "%% Film Thickness = %lf\n", fParams.filmThickness); + fprintf(fp, "%% int_x=0^infty B(x) dx / Bext = %lf (nm)\n", fParams.specularIntegral); + fprintf(fp, "%% xiP(0) = %lf (nm), xiP(t) = %lf (nm)\n", fParams.xi0, XiP_T(fParams.t)); + fprintf(fp, "%% Mean Free Path = %lf (nm)\n", fParams.meanFreePath); + fprintf(fp, "%% Film Thickness = %lf (nm)\n", fParams.filmThickness); if (fParams.specular) fprintf(fp, "%% Boundary Conditions: Specular\n"); else fprintf(fp, "%% Boundary Conditions: Diffuse\n"); + fprintf(fp, "%% Bext = %lf (G)\n", fParams.b_ext); + fprintf(fp, "%% deadLayer = %lf (nm)\n", fParams.deadLayer); if (fParams.rgeFileName.Length() > 0) fprintf(fp, "%% rge file name : %s\n", fParams.rgeFileName.Data()); if (fParams.meanB != 0.0) { diff --git a/src/tests/nonlocal/nonlocal.cpp b/src/tests/nonlocal/nonlocal.cpp index b1f57820..ed1538f1 100644 --- a/src/tests/nonlocal/nonlocal.cpp +++ b/src/tests/nonlocal/nonlocal.cpp @@ -22,11 +22,11 @@ void syntax() cout << endl << "% --------------------------------"; cout << endl << "% input parameters:"; cout << endl << "% reduced temperature"; - cout << endl << "% lambda London"; - cout << endl << "% xi0"; - cout << endl << "% mean free path"; - cout << endl << "% film thickness"; - cout << endl << "% boundary conditions"; + cout << endl << "% lambda London (nm)"; + cout << endl << "% xi0 (nm)"; + cout << endl << "% mean free path (nm)"; + cout << endl << "% film thickness (nm)"; + cout << endl << "% specular, 1=specular, 0=diffuse"; cout << endl << "% [Bext in (G)], i.e. this is optional"; cout << endl << "% [dead layer in (nm)], i.e. this is optional"; cout << endl << "% [rge input file name], i.e. this is optional";