diff options
| -rw-r--r-- | fortran/navy_four_levels/FourLevelPulseProp_Double.f95 | 16 | ||||
| -rw-r--r-- | fortran/navy_four_levels/Makefile | 14 |
2 files changed, 16 insertions, 14 deletions
diff --git a/fortran/navy_four_levels/FourLevelPulseProp_Double.f95 b/fortran/navy_four_levels/FourLevelPulseProp_Double.f95 index 096f293..f797d13 100644 --- a/fortran/navy_four_levels/FourLevelPulseProp_Double.f95 +++ b/fortran/navy_four_levels/FourLevelPulseProp_Double.f95 @@ -26,14 +26,14 @@ program FourLevelPulseProp_v3_Double ! Version 3: Make a step function in the coupling field. character*150 fname - integer nmat,npts,Nfrac,Nframe,Nframemax,NSkip,NWrite,tpts,zpts + integer nmat,npts,Nframe,Nframemax,NSkip,NWrite,zpts parameter (nmat=3,npts=100) !matrix size, number of detuning points in dispersion curve !tpts is the number of temporal points in the cell !zpts is the number of z output slices - 1 parameter (zpts=100) ! Number of slices in z direction parameter (Nframemax=2000000) parameter (NWrite=1) !number of frames to actually write - integer i,j,k,m,n + integer m,n complex*16 a1,a2,a3,a4,a5,a6 complex*16 b1,b2,b3,b4,b5,b6,b7 complex*16 c1,c2,c3,c4,c5,c6 @@ -47,7 +47,7 @@ program FourLevelPulseProp_v3_Double complex*16 k1,k2,k3,k4,k5,k6,k7,k8,k9,k10 complex*16 l1,l2,l3,l4,l5 - complex *16 Omold, Omold_vac + complex*16 Omold, Omold_vac real*8 alpha1,alpha2,alpha1tilde,alpha2tilde,alphac,alphactilde,beta,c,delmax,del1_prop,del2_prop,delc_prop real*8 dt,dz,eta real*8 W12,W21,W31,W32,W41,W42,W43,W34,ga12,ga13,ga14,ga23,ga24,ga34 @@ -55,10 +55,7 @@ program FourLevelPulseProp_v3_Double real*8 Lcell,Om1peak,Om2peak,Omcpeak,pi,tmax,tmin,tp,tshift,t_end,t_start,t_elapsed real*8 tpeak,tpeak_vac real*8 epsil,hbar,lambda - real*8 del(npts) real*8 t,z(zpts) - complex*16 yplot(nmat,npts) - complex*16 Imat(nmat) complex*16 Om1(zpts),Om2(zpts),Omc(zpts),Om_vac(zpts) @@ -70,14 +67,10 @@ program FourLevelPulseProp_v3_Double complex*16 rho41_last(zpts),rho42_last(zpts),rho43_last(zpts),rho44_last(zpts) !No Om_last because we never need the previous spatial point - complex*16 L(nmat,nmat),Linv(nmat,nmat),Ltemp(nmat,nmat) common/para/ga12,W21 - real*8 d !used by NR Routines - integer indx(nmat) - ! Fundamental numbers ci=cmplx(0.,1.) pi=acos(-1.0) @@ -298,7 +291,6 @@ program FourLevelPulseProp_v3_Double NSkip=int(NFrame/NWrite) fname='MovieParameters4level.txt' ! File name to save parameters -3 format(a150) open(9,file=fname) write (9,133)Nframe,zpts,beta,NSkip,dt 133 format(1x,i10,',',i5,',',f12.2,',',i5,',',f12.2) @@ -334,7 +326,7 @@ program FourLevelPulseProp_v3_Double rho42_last(m)=rho42(m) rho43_last(m)=rho43(m) rho44_last(m)=rho44(m) -345 end do + end do do m=zpts,2,-1 z(m)=float(m-1)*dz diff --git a/fortran/navy_four_levels/Makefile b/fortran/navy_four_levels/Makefile index f9cf9d2..2bb8d45 100644 --- a/fortran/navy_four_levels/Makefile +++ b/fortran/navy_four_levels/Makefile @@ -1,16 +1,26 @@ # -*- make -*- # FILE: "/home/evmik/src/my_src/Nresonances/fortran/navy_four_levels/Makefile" -# LAST MODIFICATION: "Sun, 10 Jul 2011 11:55:16 -0400 (evmik)" +# LAST MODIFICATION: "Mon, 08 Aug 2011 00:50:54 -0400 (evmik)" # (C) 2011 by Eugeniy Mikhailov, <evgmik@gmail.com> # $Id:$ f95files = $(wildcard *.f95) runfiles = $(f95files:%.f95=%.run) +#FORTRAN_OPTIONS = -Wall +#useful flags to check +# -Wconversion : Warn about implicit conversions that are likely to change +# the value of the expression after conversion +# -Wintrinsic-shadow : Warn if a user-defined +# procedure or module procedure has the same name as an intrinsic +# -Wunused : Warn about unused dummy arguments. +# -Werror : Turns all warnings into errors +FORTRAN_OPTIONS = -Wintrinsic-shadow -Wunused + executables: $(runfiles) $(runfiles): %.run : %.f95 - gfortran -o $@ $< + gfortran $(FORTRAN_OPTIONS) -o $@ $< clean: rm -f $(runfiles) |