Changeset 3233 for LMDZ6

Timestamp:

Feb 28, 2018, 3:54:30 PM (7 years ago)

Author:

idelkadi

Message:

Nettoyage du code :

• changement de nomes des routines pour avoir les memes nome des modules
• corrections
• dos2unix appliquee aux fichiers

Location:

LMDZ6/trunk/libf/phylmd/cosp

Files:

• m_mrgrnk.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/mrgrnk.F90)
• mod_cosp.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/cosp.F90)
• mod_cosp_constants.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/cosp_constants.F90)
• mod_cosp_isccp_simulator.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/cosp_isccp_simulator.F90)
• mod_cosp_lidar.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/cosp_lidar.F90)
• mod_cosp_misr_simulator.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/cosp_misr_simulator.F90)
• mod_cosp_modis_simulator.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/cosp_modis_simulator.F90)
• mod_cosp_radar.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/cosp_radar.F90)
• mod_cosp_simulator.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/cosp_simulator.F90)
• mod_cosp_stats.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/cosp_stats.F90)
• mod_cosp_types.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/cosp_types.F90)
• mod_cosp_utils.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/cosp_utils.F90)
• mod_llnl_stats.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/llnl_stats.F90)
• mod_lmd_ipsl_stats.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/lmd_ipsl_stats.F90)
• mod_modis_sim.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/modis_simulator.F90)
• phys_cosp.F90 (modified) (6 diffs)
• read_cosp_output_nl.F90 (modified) (4 diffs)
• scale_luts_io.F90 (moved) (moved from LMDZ6/trunk/libf/phylmd/cosp/scale_LUTs_io.F90)

LMDZ6/trunk/libf/phylmd/cosp/phys_cosp.F90

@@ -142 +142 @@
 !$OMP THREADPRIVATE(first_write)
 
+  logical, save :: ok_readxiosactive_cosp=.false.
+!$OMP THREADPRIVATE(ok_readxiosactive_cosp)
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Input variables from LMDZ-GCM
   integer                         :: overlaplmdz   !  overlap type: 1=max, 2=rand, 3=max/rand ! cosp input (output lmdz)
@@ -153 +155 @@
   real                            :: dtime,freq_cosp
   real,dimension(2)               :: time_bnds
+
+  double precision                            :: d_dtime
+  double precision,dimension(2)               :: d_time_bnds
   
    namelist/COSP_INPUT/overlap,isccp_topheight,isccp_topheight_direction, &
@@ -192 +197 @@
 !!! Ici on modifie les cles logiques selon les champs actives dans les .xml
 #ifdef CPP_XIOS
+ if (ok_readxiosactive_cosp) then
   if ((itap.gt.1).and.(first_write))then
-!    call read_xiosfieldactive(cfg)
      call read_cosp_output_nl(itap,cosp_output_nl,cfg)
-!       print*,' Dans cosp_write itap first_writ LcfadLidarsr532 =', &
-!                     itap, first_write, cfg%LcfadLidarsr532
      first_write=.false.
   endif
-!  print*,' Dans cosp_write itap LcfadLidarsr532 =', &
-!                     itap, cfg%LcfadLidarsr532
+ endif
 #endif
 
@@ -206 +208 @@
   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 ', &
@@ -225 +231 @@
         emsfc_lw = 1.
 
-        call construct_cosp_gridbox(dtime,time_bnds,radar_freq,surface_radar,use_mie_tables,use_gas_abs, &
+        call construct_cosp_gridbox(d_dtime,d_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, &
@@ -441 +447 @@
   END SUBROUTINE read_cosp_input 
 
-  SUBROUTINE read_xiosfieldactive(cfg)
-
-    USE MOD_COSP_TYPES
-#ifdef CPP_XIOS
-    USE xios, ONLY: xios_field_is_active
-#endif
-  type(cosp_config),intent(out) :: cfg
-
-! VEREFIER LES CHAMPS DEMANDES DANS .XML
-! 2. Si champs active dans .xml alors mettre la cles de sortie en true
- IF (xios_field_is_active("cllcalipso")) cfg%Lcllcalipso=.TRUE.
- IF (xios_field_is_active("clmcalipso")) cfg%Lclmcalipso=.TRUE.
- IF (xios_field_is_active("clhcalipso")) cfg%Lclhcalipso=.TRUE.
- IF (xios_field_is_active("cltcalipso")) cfg%Lcltcalipso=.TRUE.
-! IF (xios_field_is_active("pcllcalipso")) cfg%Lcllcalipso=.TRUE.
-! IF (xios_field_is_active("pclmcalipso")) cfg%Lclmcalipso=.TRUE.
-! IF (xios_field_is_active("pclhcalipso")) cfg%Lclhcalipso=.TRUE.
-! IF (xios_field_is_active("pcltcalipso")) cfg%Lcltcalipso=.TRUE.
- IF (xios_field_is_active("cllcalipsoice")) cfg%Lcllcalipsoice=.TRUE.
- IF (xios_field_is_active("clmcalipsoice")) cfg%Lclmcalipsoice=.TRUE.
- IF (xios_field_is_active("clhcalipsoice")) cfg%Lclhcalipsoice=.TRUE.
- IF (xios_field_is_active("cltcalipsoice")) cfg%Lcltcalipsoice=.TRUE.
- IF (xios_field_is_active("cllcalipsoliq")) cfg%Lcllcalipsoliq=.TRUE.
- IF (xios_field_is_active("clmcalipsoliq")) cfg%Lclmcalipsoliq=.TRUE.
- IF (xios_field_is_active("clhcalipsoliq")) cfg%Lclhcalipsoliq=.TRUE.
- IF (xios_field_is_active("cltcalipsoliq")) cfg%Lcltcalipsoliq=.TRUE.
- IF (xios_field_is_active("cllcalipsoun")) cfg%Lcllcalipsoun=.TRUE.
- IF (xios_field_is_active("clmcalipsoun")) cfg%Lclmcalipsoun=.TRUE.
- IF (xios_field_is_active("clhcalipsoun")) cfg%Lclhcalipsoun=.TRUE.
- IF (xios_field_is_active("cltcalipsoun")) cfg%Lcltcalipsoun=.TRUE.
- IF (xios_field_is_active("clcalipso")) cfg%Lclcalipso=.TRUE.
-! IF (xios_field_is_active("pclcalipso")) cfg%Lclcalipso=.TRUE.
- IF (xios_field_is_active("clcalipsoice")) cfg%Lclcalipsoice=.TRUE.
- IF (xios_field_is_active("clcalipsoliq")) cfg%Lclcalipsoliq=.TRUE.
- IF (xios_field_is_active("clcalipsoun")) cfg%Lclcalipsoun=.TRUE.
- IF (xios_field_is_active("clcalipsotmp")) cfg%Lclcalipsotmp=.TRUE.
- IF (xios_field_is_active("clcalipsotmpice")) cfg%Lclcalipsotmpice=.TRUE.
- IF (xios_field_is_active("clcalipsotmpliq")) cfg%Lclcalipsotmpliq=.TRUE.
- IF (xios_field_is_active("clcalipsotmpun")) cfg%Lclcalipsotmpun=.TRUE.
- IF (xios_field_is_active("parasol_refl")) cfg%LparasolRefl=.TRUE.
- IF (xios_field_is_active("parasol_crefl")) cfg%LparasolRefl=.TRUE.
- IF (xios_field_is_active("Ncrefl")) cfg%LparasolRefl=.TRUE.
- IF (xios_field_is_active("cfad_lidarsr532")) cfg%LcfadLidarsr532=.TRUE.
- IF (xios_field_is_active("atb532")) cfg%Latb532=.TRUE.
- IF (xios_field_is_active("beta_mol532")) cfg%LlidarBetaMol532=.TRUE.
- IF (xios_field_is_active("clopaquecalipso")) cfg%Lclopaquecalipso=.TRUE.
- IF (xios_field_is_active("clthincalipso")) cfg%Lclthincalipso=.TRUE.
- IF (xios_field_is_active("clzopaquecalipso")) cfg%Lclzopaquecalipso=.TRUE.
- IF (xios_field_is_active("clcalipsoopaque")) cfg%Lclcalipsoopaque=.TRUE.
- IF (xios_field_is_active("clcalipsothin")) cfg%Lclcalipsothin=.TRUE.
- IF (xios_field_is_active("clcalipsozopaque")) cfg%Lclcalipsozopaque=.TRUE.
- IF (xios_field_is_active("clcalipsoopacity")) cfg%Lclcalipsoopacity=.TRUE.
- IF (xios_field_is_active("proftemp")) cfg%Lproftemp=.TRUE.
- IF (xios_field_is_active("profSR")) cfg%LprofSR=.TRUE.
-
- IF (xios_field_is_active("cfadDbze94")) cfg%LcfadDbze94=.TRUE.
- IF (xios_field_is_active("dbze94")) cfg%Ldbze94=.TRUE.
- IF (xios_field_is_active("cltlidarradar")) cfg%Lcltlidarradar=.TRUE.
- IF (xios_field_is_active("clcalipso2")) cfg%Lclcalipso2=.TRUE.
-
-   IF (xios_field_is_active("clisccp2")) cfg%Lclisccp=.TRUE.
- IF (xios_field_is_active("boxtauisccp")) cfg%Lboxtauisccp=.TRUE.
- IF (xios_field_is_active("boxptopisccp")) cfg%Lboxptopisccp=.TRUE.
- IF (xios_field_is_active("tclisccp")) cfg%Lcltisccp=.TRUE.
- IF (xios_field_is_active("ctpisccp")) cfg%Lpctisccp=.TRUE.
- IF (xios_field_is_active("tauisccp")) cfg%Ltauisccp=.TRUE.
- IF (xios_field_is_active("albisccp")) cfg%Lalbisccp=.TRUE.
- IF (xios_field_is_active("meantbisccp")) cfg%Lmeantbisccp=.TRUE.
- IF (xios_field_is_active("meantbclrisccp")) cfg%Lmeantbclrisccp=.TRUE.
-
-   IF (xios_field_is_active("clMISR")) cfg%LclMISR=.TRUE.
-
-IF (xios_field_is_active("cllmodis")) cfg%Lcllmodis=.TRUE.
- IF (xios_field_is_active("clmmodis")) cfg%Lclmmodis=.TRUE.
- IF (xios_field_is_active("clhmodis")) cfg%Lclhmodis=.TRUE.
- IF (xios_field_is_active("cltmodis")) cfg%Lcltmodis=.TRUE.
- IF (xios_field_is_active("clwmodis")) cfg%Lclwmodis=.TRUE.
- IF (xios_field_is_active("climodis")) cfg%Lclimodis=.TRUE.
- IF (xios_field_is_active("tautmodis")) cfg%Ltautmodis=.TRUE.
- IF (xios_field_is_active("tauwmodis")) cfg%Ltauwmodis=.TRUE.
- IF (xios_field_is_active("tauimodis")) cfg%Ltauimodis=.TRUE.
- IF (xios_field_is_active("tautlogmodis")) cfg%Ltautlogmodis=.TRUE.
- IF (xios_field_is_active("tauilogmodis")) cfg%Ltauilogmodis=.TRUE.
- IF (xios_field_is_active("tauwlogmodis")) cfg%Ltauwlogmodis=.TRUE.
- IF (xios_field_is_active("reffclwmodis")) cfg%Lreffclwmodis=.TRUE.
- IF (xios_field_is_active("reffclimodis")) cfg%Lreffclimodis=.TRUE.
- IF (xios_field_is_active("pctmodis")) cfg%Lpctmodis=.TRUE.
- IF (xios_field_is_active("lwpmodis")) cfg%Llwpmodis=.TRUE.
- IF (xios_field_is_active("iwpmodis")) cfg%Liwpmodis=.TRUE.
- IF (xios_field_is_active("clmodis")) cfg%Lclmodis=.TRUE.
- IF (xios_field_is_active("crimodis")) cfg%Lcrimodis=.TRUE.
- IF (xios_field_is_active("crlmodis")) cfg%Lcrlmodis=.TRUE.
-
-! 2.  si champs demande alors activer le simulateur correspondant
-   IF (xios_field_is_active("cllcalipso").OR. &
-       xios_field_is_active("clmcalipso").OR. &
-       xios_field_is_active("clhcalipso").OR. &
-       xios_field_is_active("cltcalipso").OR. &
-!       xios_field_is_active("pcllcalipso").OR. &
-!       xios_field_is_active("pclmcalipso").OR. &
-!       xios_field_is_active("pclhcalipso").OR. &
-!       xios_field_is_active("pcltcalipso").OR. &
-       xios_field_is_active("cllcalipsoice").OR. &
-       xios_field_is_active("clmcalipsoice").OR. &
-       xios_field_is_active("clhcalipsoice").OR. &
-       xios_field_is_active("cltcalipsoice").OR. &
-       xios_field_is_active("cllcalipsoliq").OR. &
-       xios_field_is_active("clmcalipsoliq").OR. &
-       xios_field_is_active("clhcalipsoliq").OR. &
-       xios_field_is_active("cltcalipsoliq").OR. &
-       xios_field_is_active("cllcalipsoun").OR. &
-       xios_field_is_active("clmcalipsoun").OR. &
-       xios_field_is_active("clhcalipsoun").OR. &
-       xios_field_is_active("cltcalipsoun").OR. &
-       xios_field_is_active("clcalipso").OR. &
-!       xios_field_is_active("pclcalipso").OR. &
-       xios_field_is_active("clcalipsoice").OR. &
-       xios_field_is_active("clcalipsoliq").OR. &
-       xios_field_is_active("clcalipsoun").OR. &
-       xios_field_is_active("clcalipsotmp").OR. &
-       xios_field_is_active("clcalipsotmpice").OR. &
-       xios_field_is_active("clcalipsotmpliq").OR. &
-       xios_field_is_active("clcalipsotmpun").OR. &
-       xios_field_is_active("parasol_refl").OR. &
-       xios_field_is_active("parasol_crefl").OR. &
-       xios_field_is_active("Ncrefl").OR. &
-       xios_field_is_active("cfad_lidarsr532").OR. &
-       xios_field_is_active("atb532").OR. &
-       xios_field_is_active("beta_mol532").OR. &
-       xios_field_is_active("clopaquecalipso").OR. &
-       xios_field_is_active("clthincalipso").OR. &
-       xios_field_is_active("clzopaquecalipso").OR. &
-       xios_field_is_active("clcalipsoopaque").OR. &
-       xios_field_is_active("clcalipsothin").OR. &
-       xios_field_is_active("clcalipsozopaque").OR. &
-       xios_field_is_active("clcalipsoopacity").OR. &
-       xios_field_is_active("proftemp").OR. &
-       xios_field_is_active("profSR")) cfg%Llidar_sim=.TRUE.
-
-    IF (xios_field_is_active("cfadDbze94").OR. &
-      xios_field_is_active("dbze94")) &
-               cfg%Lradar_sim=.TRUE.
-
-    IF (xios_field_is_active("cltlidarradar").OR. &
-      xios_field_is_active("clcalipso2")) THEN
-               cfg%Lradar_sim=.TRUE.
-               cfg%Llidar_sim=.TRUE.
-    ENDIF
-
-    IF (xios_field_is_active("clisccp2").OR. &
-       xios_field_is_active("boxtauisccp").OR. &
-       xios_field_is_active("boxptopisccp").OR. &
-       xios_field_is_active("tclisccp").OR. &
-       xios_field_is_active("ctpisccp").OR. &
-       xios_field_is_active("tauisccp").OR. &
-       xios_field_is_active("albisccp").OR. &
-       xios_field_is_active("meantbisccp").OR. &
-       xios_field_is_active("meantbclrisccp")) cfg%Lisccp_sim=.TRUE. 
-
-    IF (xios_field_is_active("clMISR")) cfg%Lmisr_sim=.TRUE.
-
-    IF (xios_field_is_active("cllmodis").OR. &
-       xios_field_is_active("clmmodis").OR. &
-       xios_field_is_active("clhmodis").OR. &
-       xios_field_is_active("cltmodis").OR. &
-       xios_field_is_active("clwmodis").OR. &
-       xios_field_is_active("climodis").OR. &
-       xios_field_is_active("tautmodis").OR. &
-       xios_field_is_active("tauwmodis").OR. &
-       xios_field_is_active("tauimodis").OR. &
-       xios_field_is_active("tautlogmodis").OR. &
-       xios_field_is_active("tauilogmodis").OR. &
-       xios_field_is_active("tauwlogmodis").OR. &
-       xios_field_is_active("reffclwmodis").OR. &
-       xios_field_is_active("reffclimodis").OR. &
-       xios_field_is_active("pctmodis").OR. &
-       xios_field_is_active("lwpmodis").OR. &
-       xios_field_is_active("iwpmodis").OR. &
-       xios_field_is_active("clmodis").OR. &
-       xios_field_is_active("crimodis").OR. &
-       xios_field_is_active("crlmodis")) cfg%Lmodis_sim=.TRUE.
-  END SUBROUTINE read_xiosfieldactive 
-
-
 end subroutine phys_cosp

LMDZ6/trunk/libf/phylmd/cosp/read_cosp_output_nl.F90

@@ -127 +127 @@
   CALL bcast(Lmeantbisccp)
   CALL bcast(Lmeantbclrisccp)
-  CALL bcast(Lfrac_out)
+  CALL bcast(Lfracout)
   CALL bcast(LlidarBetaMol532)
   CALL bcast(Lcltmodis)
@@ -239 +239 @@
   if ((.not.Lradar_sim).and.(.not.Llidar_sim).and. &
       (.not.Lisccp_sim).and.(.not.Lmisr_sim)) then
-    Lfrac_out = .false.
+    Lfracout = .false.
   endif
  if (.not.Lmodis_sim) then
@@ -533 +533 @@
   cfg%Lcrlmodis=Lcrlmodis
   
-    if (itap.gt.1) then
+#ifdef CPP_XIOS
+ if (itap.gt.1) then
 
 ! VEREFIER LES CHAMPS DEMANDES DANS .XML
@@ -709 +710 @@
        xios_field_is_active("crlmodis")) cfg%Lmodis_sim=.TRUE.
 
-  endif
-
+ endif
+#endif
 
  END SUBROUTINE READ_COSP_OUTPUT_NL