Changeset 1429 for trunk/LMDZ.GENERIC

Timestamp:

May 22, 2015, 3:28:56 PM (10 years ago)

Author:

msylvestre

Message:

Some computations relative to the rings' shadow have been moved from physiq.f90 to call_rings.f90

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• call_rings.F90 (added)
• physiq.F90 (modified) (6 diffs)

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

@@ -11 +11 @@
       use watercommon_h, only : RLVTT, Psat_water,epsi
       use gases_h, only: gnom, gfrac
-      use radcommon_h, only: sigma, eclipse, glat, grav
+      use radcommon_h, only: sigma, glat, grav
       use radii_mod, only: h2o_reffrad, co2_reffrad
       use aerosol_mod, only: iaero_co2, iaero_h2o
@@ -441 +441 @@
 !$OMP THREADPRIVATE(ice_initial,ice_min,ice_update)
 
-!     included by MS to compute the daily average of rings shadowing
-      integer, parameter :: nb_hours = 1536 ! set how many times per day are used
-      real :: pas
-      integer :: m
-      ! temporary variables computed at each step of this average 
-      real :: ptime_day ! Universal time in sol fraction 
-      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
-
 !     included by BC for slab ocean
       real, dimension(:),allocatable,save ::  pctsrf_sic
@@ -526 +516 @@
             
          !! this is defined in radcommon_h
-         ALLOCATE(eclipse(ngrid))
          ALLOCATE(glat(ngrid))
 
@@ -873 +862 @@
            
            !! Eclipse incoming sunlight (e.g. Saturn ring shadowing)
-
-           if(rings_shadow) then 
-                write(*,*) 'Rings shadow activated'
-                if(diurnal .eqv. .false.) then ! we need to compute the daily average insolation 
-                    pas = 1./nb_hours
-                    ptime_day = 0.
-                    fract(:) = 0.
-                    ALLOCATE(tmp_fract(ngrid))
-                    ALLOCATE(tmp_mu0(ngrid))
-                    tmp_fract(:) = 0.
-                    eclipse(:) = 0.
-                    tmp_mu0(:) = 0.
-                    
-                    do m=1, nb_hours
-                        ptime_day = m*pas
-                        call stellarlong(pday+ptime_day,tmp_zls)
-                        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, 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
-                    enddo
-                
-                    DEALLOCATE(tmp_fract)
-                    DEALLOCATE(tmp_mu0)
-            
-                    fract(:) = fract(:)/nb_hours
-                 
-                 else   
-                    call rings(ngrid, declin, ptime, rad, 0., eclipse)
-                    fract(:) = fract(:) * (1.-eclipse)
-                 endif
-            else
-                 eclipse(:) = 0.0
-            endif
+        
+            if(rings_shadow) then
+                call call_rings(ngrid, ptime, pday, diurnal)
+            endif    
+
 
            if (corrk) then
@@ -934 +886 @@
       
 !             standard callcorrk
-
-
-
 
               if(ok_slab_ocean) then
@@ -2274 +2223 @@
         !! this is defined in comsaison_h
         IF ( ALLOCATED(mu0)) DEALLOCATE(mu0)
-
         IF ( ALLOCATED(fract)) DEALLOCATE(fract)
-
-
-        !! this is defined in radcommon_h
-        IF ( ALLOCATED(eclipse)) DEALLOCATE(eclipse)
 
         !! this is defined in comsoil_h