Changeset 2160 for LMDZ5/branches/testing/libf/cosp/phys_cosp.F90

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

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

LMDZ5/branches/testing/libf/cosp/phys_cosp.F90

@@ -6 +6 @@
   subroutine phys_cosp( itap,dtime,freq_cosp, &
                         ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP, &
-                        ecrit_mth,ecrit_day,ecrit_hf, &
+                        ecrit_mth,ecrit_day,ecrit_hf, ok_all_xml, &
                         Nptslmdz,Nlevlmdz,lon,lat, presnivs,overlaplmdz,sunlit, &
                         ref_liq,ref_ice,fracTerLic,u_wind,v_wind,phis,phi,ph,p,skt,t, &
@@ -84 +84 @@
   character(len=64),PARAMETER  :: cosp_input_nl='cosp_input_nl.txt'
   character(len=64),PARAMETER  :: cosp_output_nl='cosp_output_nl.txt'
-  character(len=512), save :: finput ! Input file name
-  character(len=512), save :: cmor_nl
   integer, save :: isccp_topheight,isccp_topheight_direction,overlap
   integer,save  :: Ncolumns     ! Number of subcolumns in SCOPS
@@ -121 +119 @@
   integer :: ii
   real    :: ecrit_day,ecrit_hf,ecrit_mth
-  logical :: ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP
+  logical :: ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP, ok_all_xml
 
   logical, save :: debut_cosp=.true.
@@ -140 +138 @@
   
 !
-   namelist/COSP_INPUT/cmor_nl,overlap,isccp_topheight,isccp_topheight_direction, &
-              npoints_it,ncolumns,nlevels,use_vgrid,nlr,csat_vgrid,finput, &
+   namelist/COSP_INPUT/overlap,isccp_topheight,isccp_topheight_direction, &
+              npoints_it,ncolumns,use_vgrid,nlr,csat_vgrid, &
               radar_freq,surface_radar,use_mie_tables, &
               use_gas_abs,do_ray,melt_lay,k2,Nprmts_max_hydro,Naero,Nprmts_max_aero, &
@@ -297 +295 @@
      if (debut_cosp) then
 
+      !$OMP MASTER
         print *, ' Open outpts files and define axis'
         call cosp_output_open(Nlevlmdz, Ncolumns, presnivs, dtime, freq_cosp, &
-                              ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP, &
+                              ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP, ok_all_xml, &
                               ecrit_mth, ecrit_day, ecrit_hf, use_vgrid, vgrid)
-
+      !$OMP END MASTER
+      !$OMP BARRIER
         debut_cosp=.false.
       endif ! debut_cosp
@@ -313 +313 @@
 !!!!!!!!!!!!!!!!!! Ecreture des sorties Cosp !!!!!!!!!!!!!!r!!!!!!:!!!!!
        print *, 'Calling write output'
-        call cosp_output_write(Nlevlmdz, Npoints, Ncolumns, itap, dtime, freq_COSP, cfg, gbx, sglidar, stlidar, isccp)
+        call cosp_output_write(Nlevlmdz, Npoints, Ncolumns, itap, dtime, freq_COSP, &
+                               cfg, gbx, vgrid, sglidar, stlidar, isccp)
 
 !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -343 +344 @@
       CLOSE(10)
     ENDIF
-    CALL bcast(cmor_nl)
     CALL bcast(overlap)
     CALL bcast(isccp_topheight)
@@ -349 +349 @@
     CALL bcast(npoints_it)
     CALL bcast(ncolumns)
-    CALL bcast(nlevels)
     CALL bcast(use_vgrid)
     CALL bcast(nlr)
     CALL bcast(csat_vgrid)
-    CALL bcast(finput)
     CALL bcast(radar_freq)
     CALL bcast(surface_radar)