From 25811b4b9cee2ace4996e10b15b4e16ac25e1c43 Mon Sep 17 00:00:00 2001 From: Eugeniy Mikhailov Date: Fri, 26 Aug 2011 11:11:03 -0400 Subject: Names g1, ..., g8 --> gc1, ... ,gc8 to avoid confusion with decay rates --- .../navy_four_levels/FourLevelPulseProp_Double.f95 | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/fortran/navy_four_levels/FourLevelPulseProp_Double.f95 b/fortran/navy_four_levels/FourLevelPulseProp_Double.f95 index 9279e69..e00e49a 100644 --- a/fortran/navy_four_levels/FourLevelPulseProp_Double.f95 +++ b/fortran/navy_four_levels/FourLevelPulseProp_Double.f95 @@ -57,7 +57,7 @@ program FourLevelPulseProp_v3_Double complex*16 d1,d2,d3,d4,d5,d6,d7 complex*16 e1,e2,e3,e4,e5 complex*16 f1,f2,f3,f4,f5 - complex*16 g1,g2,g3,g4,g5,g6,g7 + complex*16 gc1,gc2,gc3,gc4,gc5,gc6,gc7 complex*16 h1,h2,h3,h4,h5 complex*16 i1,i2,i3,i4,i5,i6,i7 complex*16 j1,j2,j3,j4,j5,j6,j7,j8 @@ -257,13 +257,13 @@ program FourLevelPulseProp_v3_Double f4=0.25*ci*dt f5=-0.25*ci*dt - g1=1-(ga23+ci*del1_prop)*dt - g2=-0.25*ci*dt - g3=0.25*ci*dt - g4=0.25*ci*dt - g5=-0.25*ci*dt - g6=0.25*ci*dt - g7=0.25*ci*dt + gc1=1-(ga23+ci*del1_prop)*dt + gc2=-0.25*ci*dt + gc3=0.25*ci*dt + gc4=0.25*ci*dt + gc5=-0.25*ci*dt + gc6=0.25*ci*dt + gc7=0.25*ci*dt h1=1-(ga24+ci*delc_prop)*dt h2=0.25*ci*dt @@ -377,9 +377,9 @@ program FourLevelPulseProp_v3_Double ! rho22(m) needs to be calculated lower down - rho23(m)=g1*rho23_last(m)+g2*conjg(Om1(m))*rho21_last(m)+g3*conjg(Om2(m))*(rho33_last(m)-rho22_last(m)) - rho23(m)=rho23(m)+g4*conjg(Omc(m))*rho43_last(m)+g5*conjg(Om1(m-1))*rho21_last(m) - rho23(m)=rho23(m)+g6*conjg(Om2(m-1))*(rho33_last(m)-rho22_last(m))+g7*conjg(Omc(m-1))*rho43_last(m) + rho23(m)=gc1*rho23_last(m)+gc2*conjg(Om1(m))*rho21_last(m)+gc3*conjg(Om2(m))*(rho33_last(m)-rho22_last(m)) + rho23(m)=rho23(m)+gc4*conjg(Omc(m))*rho43_last(m)+gc5*conjg(Om1(m-1))*rho21_last(m) + rho23(m)=rho23(m)+gc6*conjg(Om2(m-1))*(rho33_last(m)-rho22_last(m))+gc7*conjg(Omc(m-1))*rho43_last(m) rho24(m)=h1*rho24_last(m)+h2*conjg(Om2(m))*rho34_last(m)+h3*conjg(Omc(m))*(rho44_last(m)-rho22_last(m)) rho24(m)=rho24(m)+h4*conjg(Om2(m-1))*rho34_last(m)+h5*conjg(Omc(m-1))*(rho44_last(m)-rho22_last(m)) -- cgit v1.2.3