grayvg branch integrated in gaussfit. other branches synced

fix to initialisation in reflections module propagated to other branches
2015-05-21 10:52:04 +00:00 · 2014-06-10 14:03:41 +00:00 · 2014-06-10 14:03:41 +00:00 · 2014-06-10 14:03:41 +00:00 · 2013-10-11 15:11:52 +00:00 · 2013-10-11 15:10:56 +00:00
4 changed files with 731 additions and 53 deletions
--- a/6
+++ b/6
@ -3,7 +3,7 @@ EXE=gray

 # Objects list
 OBJ=gray.o grayl.o reflections.o green_func_p.o \
-    const_and_precisions.o itm_constants.o itm_types.o
+    const_and_precisions.o itm_constants.o itm_types.o singleton.o

 # Alternative search paths
 vpath %.f90 src
@ -11,7 +11,7 @@ vpath %.f src

 # Fortran compiler name and flags
 FC=gfortran
-FFLAGS=-O3 
+FFLAGS=-O3 -fcheck=all

 DIRECTIVES = -DREVISION="'$(shell svnversion src)'"

@ -22,7 +22,7 @@ $(EXE): $(OBJ)
 	$(FC) $(FFLAGS) -o $@ $^

 # Dependencies on modules
-gray.o: green_func_p.o reflections.o
+gray.o: green_func_p.o reflections.o singleton.o
 green_func_p.o: const_and_precisions.o
 const_and_precisions.o: itm_types.o itm_constants.o
 itm_constants.o: itm_types.o
--- a/src/gray.f
+++ b/src/gray.f
--- a/src/grayl.f
+++ b/src/grayl.f
@ -10902,3 +10902,4 @@ c
      errest = 2.0d0*errest
      go to 82
      end
+
--- a/src/reflections.f90
+++ b/src/reflections.f90
@ -32,7 +32,8 @@ subroutine inters_linewall(xv,kv,rw,zw,nw,sint,normw)
  integer :: i,j,ni,iint
  real(r8), dimension(2) :: si,ti
  real(r8) :: drw,dzw,xint,yint,rint,l,kxy
-  real(r8) :: tol=sqrt(epsilon(1.0_r8))
+  real(r8) :: tol
+  tol=sqrt(epsilon(1.0_r8))
  sint=huge(sint)
  iint=0
  normw=0.0_r8
Author	SHA1	Message	Date
Lorenzo Figini	4cc5013d20	grayvg branch integrated in gaussfit. other branches synced	2015-05-21 10:52:04 +00:00
Lorenzo Figini	ec6d38b0cf	fix to initialisation in reflections module propagated to other branches	2014-06-10 14:03:41 +00:00
Lorenzo Figini	4909c9fe13	fix to initialisation in reflections module propagated to other branches	2014-06-10 14:03:41 +00:00
Lorenzo Figini	5a5406a5cf	fix to initialisation in reflections module propagated to other branches	2014-06-10 14:03:41 +00:00
Lorenzo Figini	ee98ed5eb5	merged correction from trunk rev 52 (spline coefficients dimensions)	2013-10-11 15:11:52 +00:00
Lorenzo Figini	85b13a4b8d	cleaned output. merged correction from trunk rev 52 (spline coefficients dimensions)	2013-10-11 15:10:56 +00:00
Lorenzo Figini	81dc2d0a3c	added print og psi,X,Y on R,z grid	2013-09-20 14:48:53 +00:00
Alberto Mariani	20a995e79d	added the calculation of the reference ray arclength and some modifications in projxyzt subroutine	2013-07-19 14:36:31 +00:00
Alberto Mariani	d7ced56519	modified projxyzt: added window function and corrected the case iplane=2	2013-05-29 13:46:25 +00:00
Alberto Mariani	892947b1de	modified gauss fit and fft calculation in projxyzt	2013-05-23 17:09:54 +00:00
Alberto Mariani	4faca7994e	added ak0 common	2013-05-21 16:48:25 +00:00
Alberto Mariani	e74ec6eecb	projxyzt modified:in output correct inverse radii of curvature	2013-05-21 15:41:15 +00:00
Alberto Mariani	185920b12d	projxyzt modified:in output correct inverse radii of curvature	2013-05-21 15:41:15 +00:00
Lorenzo Figini	fbe86719f3	local modifications in gaussfit copied in oxb version	2013-05-09 09:18:53 +00:00
Lorenzo Figini	9df962f420	projxyzt fixed. now ywrk is left unchanged	2013-05-09 09:05:36 +00:00
Lorenzo Figini	5c641a55ec	Changed arguments in fwork. Added projection on plane when integrating in Sr (iplane=2,3) - fix needed in projxyzt (ywrk)	2013-05-07 14:38:59 +00:00
Lorenzo Figini	e341062dcb	added option for ray integration on planes perp to central k	2013-04-30 16:35:51 +00:00
Lorenzo Figini	03bd185017	Added spline interpolation of S_I in projxyzt. To be fixed...	2013-04-29 13:57:47 +00:00
Alberto Mariani	9edc3079ba	projxyzt with gaussian fit	2013-04-18 15:42:10 +00:00
Lorenzo Figini	38c617b743	Created branch for phase front fitting	2013-04-18 15:32:18 +00:00
Lorenzo Figini	ea75b096cb	Added prints for OXB	2013-04-18 15:26:27 +00:00
Lorenzo Figini	5f8331937d	Branch for OXB analysis created	2013-04-18 15:01:41 +00:00