Changeset 1415 for LMDZ4/branches/LMDZ4_AR5/libf/cosp/cosp_simulator.F90

Timestamp:

Jul 15, 2010, 5:34:00 PM (14 years ago)

Author:

idelkadi

Message:

Passage a la version cosp.v1.3 pour le Lidar et ISCCP
Corrections de bugs pour ISCCP et optimisation pour le Lidar

File:

• LMDZ4/branches/LMDZ4_AR5/libf/cosp/cosp_simulator.F90 (modified) (2 diffs)

LMDZ4/branches/LMDZ4_AR5/libf/cosp/cosp_simulator.F90

@@ -65 +65 @@
   !+++++++++ Radar model ++++++++++  
   if (cfg%Lradar_sim) then
-    call system_clock(t0,count_rate,count_max)
     call cosp_radar(gbx,sgx,sghydro,sgradar)
-    call system_clock(t1,count_rate,count_max)
-    print *, '%%%%%%  Radar:', (t1-t0)*1.0/count_rate, ' s'
-  else 
-    print *, '%%%%%%  Radar not used'
   endif
   
   !+++++++++ Lidar model ++++++++++
   if (cfg%Llidar_sim) then
-    call system_clock(t0,count_rate,count_max)
     call cosp_lidar(gbx,sgx,sghydro,sglidar)
-    call system_clock(t1,count_rate,count_max)
-    print *, '%%%%%%  Lidar:', (t1-t0)*1.0/count_rate, ' s'
-  else 
-    print *, '%%%%%%  Lidar not used'
   endif
 
@@ -86 +76 @@
   !+++++++++ ISCCP simulator ++++++++++
   if (cfg%Lisccp_sim) then
-    call system_clock(t0,count_rate,count_max)
     call cosp_isccp_simulator(gbx,sgx,isccp)
-    call system_clock(t1,count_rate,count_max)
-    print *, '%%%%%%  ISCCP:', (t1-t0)*1.0/count_rate, ' s'
-  else 
-    print *, '%%%%%%  ISCCP not used'
   endif
   
   !+++++++++ MISR simulator ++++++++++
   if (cfg%Lmisr_sim) then
-    call system_clock(t0,count_rate,count_max)
     call cosp_misr_simulator(gbx,sgx,misr)
-    call system_clock(t1,count_rate,count_max)
-    print *, '%%%%%%  MISR:', (t1-t0)*1.0/count_rate, ' s'
-  else 
-    print *, '%%%%%%  MISR not used'
   endif
   
 
   !+++++++++++ Summary statistics +++++++++++
-!   write(*,*) 'Stats:'
-!   read(*,*) c 
   if (cfg%Lstats) then
-    call system_clock(t0,count_rate,count_max)
     call cosp_stats(gbx,sgx,cfg,sgradar,sglidar,vgrid,stradar,stlidar)
-    call system_clock(t1,count_rate,count_max)
-    print *, '%%%%%%  Stats:', (t1-t0)*1.0/count_rate, ' s'
-  endif
-  !+++++++++++ change of units after computation of statistics +++++++++++
-  if (cfg%Llidar_sim) then
-    where((sglidar%beta_tot > 0.0) .and. (sglidar%beta_tot /= R_UNDEF)) 
-        sglidar%beta_tot = log10(sglidar%beta_tot)
-    elsewhere
-        sglidar%beta_tot = R_UNDEF
-    end where
+!    print *, '%%%%%%  Stats:', (t1-t0)*1.0/count_rate, ' s'
   endif
 
+  
 END SUBROUTINE COSP_SIMULATOR