Changeset 3411 for LMDZ6/branches/DYNAMICO-conv/libf/phylmd/cosp/phys_cosp.F90

Timestamp:

Nov 5, 2018, 3:24:59 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Undoing merge with trunk (r3356) to properly register Yann's latest modifications

Location:

LMDZ6/branches/DYNAMICO-conv

Files:

• . (modified) (1 prop)
• libf/phylmd/cosp/phys_cosp.F90 (modified) (11 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/cosp/phys_cosp.F90

@@ -84 +84 @@
   use cosp_output_write_mod
 !  use MOD_COSP_Modis_Simulator, only : cosp_modis 
-#ifdef CPP_XIOS
-    USE xios, ONLY: xios_field_is_active
-#endif
-  use cosp_read_otputkeys
 
   IMPLICIT NONE
@@ -140 +136 @@
 !$OMP THREADPRIVATE(debut_cosp)
 
-  logical, save :: first_write=.true.
-!$OMP THREADPRIVATE(first_write)
-
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Input variables from LMDZ-GCM
   integer                         :: overlaplmdz   !  overlap type: 1=max, 2=rand, 3=max/rand ! cosp input (output lmdz)
@@ -154 +147 @@
   real                            :: dtime,freq_cosp
   real,dimension(2)               :: time_bnds
-
-  double precision                            :: d_dtime
-  double precision,dimension(2)               :: d_time_bnds
   
-  real,dimension(2,SR_BINS) :: sratio_bounds
-  real,dimension(SR_BINS)   ::  sratio_ax
-
    namelist/COSP_INPUT/overlap,isccp_topheight,isccp_topheight_direction, &
               npoints_it,ncolumns,use_vgrid,nlr,csat_vgrid, &
@@ -170 +157 @@
 
 !---------------- End of declaration of variables --------------
+   
 
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -182 +170 @@
   CALL read_cosp_input
 
-! Clefs Outputs initialisation
-  call cosp_outputkeys_init(cfg)
-!!!   call cosp_outputkeys_test(cfg)
-  print*,' Cles des differents simulateurs cosp a itap :',itap
-  print*,'Lradar_sim,Llidar_sim,Lisccp_sim,Lmisr_sim,Lmodis_sim,Lrttov_sim,Lstats', &
-          cfg%Lradar_sim,cfg%Llidar_sim,cfg%Lisccp_sim,cfg%Lmisr_sim,cfg%Lmodis_sim, &
-          cfg%Lrttov_sim,cfg%Lstats
+! Clefs Outputs 
+  call read_cosp_output_nl(cosp_output_nl,cfg)
 
     if (overlaplmdz.ne.overlap) then
@@ -195 +178 @@
    print*,'Fin lecture Namelists, debut_cosp =',debut_cosp
 
+  print*,' Cles des differents simulateurs cosp :'
+  print*,'Lradar_sim,Llidar_sim,Lisccp_sim,Lmisr_sim,Lmodis_sim,Lrttov_sim', &
+          cfg%Lradar_sim,cfg%Llidar_sim,cfg%Lisccp_sim,cfg%Lmisr_sim,cfg%Lmodis_sim,cfg%Lrttov_sim
+
   endif ! debut_cosp
-
-!!! Ici on modifie les cles logiques pour les outputs selon les champs actives dans les .xml
-  if ((itap.gt.1).and.(first_write))then
-#ifdef CPP_XIOS
-    call read_xiosfieldactive(cfg)
-#else
-    call read_cosp_output_nl(itap,cosp_output_nl,cfg)
-#endif
-    first_write=.false.
-
-    print*,' Cles des differents simulateurs cosp a itap :',itap
-    print*,'Lradar_sim,Llidar_sim,Lisccp_sim,Lmisr_sim,Lmodis_sim,Lrttov_sim,Lstats', &
-          cfg%Lradar_sim,cfg%Llidar_sim,cfg%Lisccp_sim,cfg%Lmisr_sim,cfg%Lmodis_sim, &
-          cfg%Lrttov_sim,cfg%Lstats
-  endif
 
   time_bnds(1) = dtime-dtime/2.
   time_bnds(2) = dtime+dtime/2.
 
-  d_time_bnds=time_bnds
-  d_dtime=dtime
-
+!  print*,'Debut phys_cosp itap,dtime,freq_cosp,ecrit_mth,ecrit_day,ecrit_hf ', &
+!          itap,dtime,freq_cosp,ecrit_mth,ecrit_day,ecrit_hf
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ! Allocate memory for gridbox type
@@ -224 +195 @@
 !        print *, 'Allocating memory for gridbox type...'
 
+!! AI
+!        call construct_cosp_gridbox(dble(itap),radar_freq,surface_radar,use_mie_tables,use_gas_abs,do_ray,melt_lay,k2, &
+!                                    Npoints,Nlevels,Ncolumns,N_HYDRO,Nprmts_max_hydro,Naero,Nprmts_max_aero,Npoints_it, &
+!                                    lidar_ice_type,isccp_topheight,isccp_topheight_direction,overlap,emsfc_lw, &
+!                                    use_precipitation_fluxes,use_reff, &
+!                                    Platform,Satellite,Instrument,Nchannels,ZenAng, &
+!                                    channels(1:Nchannels),surfem(1:Nchannels),co2,ch4,n2o,co,gbx)
 ! Surafce emissivity
         emsfc_lw = 1.
 
-        call construct_cosp_gridbox(d_dtime,d_time_bnds,radar_freq,surface_radar,use_mie_tables,use_gas_abs, &
+        call construct_cosp_gridbox(dtime,time_bnds,radar_freq,surface_radar,use_mie_tables,use_gas_abs, &
                                     do_ray,melt_lay,k2, &
                                     Npoints,Nlevels,Ncolumns,N_HYDRO,Nprmts_max_hydro,Naero,Nprmts_max_aero,Npoints_it, &
@@ -343 +321 @@
 
 !+++++++++++++ Open output files and define output files axis !+++++++++++++
-!    if (debut_cosp) then
+     if (debut_cosp) then
 
       !$OMP MASTER
-!        print *, ' Open outpts files and define axis'
+        print *, ' Open outpts files and define axis'
         call cosp_output_open(Nlevlmdz, Ncolumns, presnivs, dtime, freq_cosp, &
                               ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP, ok_all_xml, &
@@ -353 +331 @@
       !$OMP BARRIER
         debut_cosp=.false.
-!      endif ! debut_cosp
-!    else
+      endif ! debut_cosp
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
         ! Call simulator
@@ -367 +344 @@
 !#endif
 !!
+
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
@@ -375 +353 @@
                                cfg, gbx, vgrid, sglidar, sgradar, stlidar, stradar, & 
                                isccp, misr, modis)
-!    endif !debut_cosp
+
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
         ! Deallocate memory in derived types
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-        print *, 'Deallocating memory...'
+!        print *, 'Deallocating memory...'
         call free_cosp_gridbox(gbx)
         call free_cosp_subgrid(sgx)