Changeset 1329 for trunk/LMDZ.GENERIC

Timestamp:

Aug 21, 2014, 6:20:57 PM (10 years ago)

Author:

jleconte

Message:

21/08/2014 == JL

• in the ring shadow calculation, temporary variables for the orbbital parameters are now used (we want the declin and RA output at the same time w and wo rings)

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/physiq.F90 (modified) (5 diffs)

trunk/LMDZ.GENERIC/README

@@ -1046 +1046 @@
 - fixed variable type declaration bug in ave_stelspec
 - corrected insolation calculation in locked and inclined case (proper calculation of sub solar longitude and declination)
+- in the ring shadow calculation, temporary variables for the orbbital parameters are now used (we want the declin and RA output at the same time w and wo rings)

trunk/LMDZ.GENERIC/libf/phystd/physiq.F90

@@ -452 +452 @@
       ! temporary variables computed at each step of this average 
       real :: ptime_day ! Universal time in sol fraction 
-      real :: tmp_zls   ! solar longitude
+      real :: tmp_zls,tmp_dist_star, tmp_declin, tmp_right_ascen   ! tmp solar longitude, stellar dist, declin and RA
       real, dimension(:), allocatable :: tmp_fract ! day fraction of the time interval 
       real, dimension(:), allocatable :: tmp_mu0 ! equivalent solar angle
@@ -762 +762 @@
       zday=pday+ptime ! compute time, in sols (and fraction thereof)
 
-!     Compute Stellar Longitude (Ls)
+!     Compute Stellar Longitude (Ls), and orbital parameters
 !     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       if (season) then
@@ -770 +770 @@
       end if
 
+      call orbite(zls,dist_star,declin,right_ascen)
+      if (tlocked) then
+              zlss=Mod(-(2.*pi*(zday/year_day)*nres - right_ascen),2.*pi)
+      elseif (diurnal) then
+              zlss=-2.*pi*(zday-.5)
+      else if(diurnal .eqv. .false.) then
+              zlss=9999.
+      endif 
 
 
@@ -845 +853 @@
 !          Compute local stellar zenith angles
 !          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-           call orbite(zls,dist_star,declin,right_ascen)
 
            if (tlocked) then
 ! JL14 corrects tidally resonant (and inclined) cases. nres=omega_rot/omega_orb
-              zlss=Mod(-(2.*pi*(zday/year_day)*nres - right_ascen),2.*pi)
               ztim1=SIN(declin)
               ztim2=COS(declin)*COS(zlss)
               ztim3=COS(declin)*SIN(zlss)
 
-
               call stelang(ngrid,sinlon,coslon,sinlat,coslat,    &
                ztim1,ztim2,ztim3,mu0,fract, flatten)
 
            elseif (diurnal) then
-              zlss=-2.*pi*(zday-.5)
               ztim1=SIN(declin)
               ztim2=COS(declin)*COS(2.*pi*(zday-.5))
@@ -890 +894 @@
                         ptime_day = m*pas
                         call stellarlong(pday+ptime_day,tmp_zls)
-                        call orbite(tmp_zls,dist_star,declin)
-                        ztim1=SIN(declin)
-                        ztim2=COS(declin)*COS(2.*pi*(pday+ptime_day-.5))
-                        ztim3=-COS(declin)*SIN(2.*pi*(pday+ptime_day-.5))
+                        call orbite(tmp_zls,tmp_dist_star,tmp_declin,tmp_right_ascen)
+                        ztim1=SIN(tmp_declin)
+                        ztim2=COS(tmp_declin)*COS(2.*pi*(pday+ptime_day-.5))
+                        ztim3=-COS(tmp_declin)*SIN(2.*pi*(pday+ptime_day-.5))
+
                   
                         call stelang(ngrid,sinlon,coslon,sinlat,coslat,    &
                                  ztim1,ztim2,ztim3,tmp_mu0,tmp_fract, flatten)
                   
-                        call rings(ngrid, declin, ptime_day, rad, flatten, eclipse)
+                        call rings(ngrid, tmp_declin, ptime_day, rad, flatten, eclipse)
                   
                         fract(:) = fract(:) + (1.-eclipse(:))*tmp_fract(:) !! fract prend en compte l'ombre des anneaux et l'alternance jour/nuit