Changeset 2160 for LMDZ5/branches/testing/libf/phylmd/cv3_routines.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/phylmd/cv3_routines.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/phylmd/cv3_routines.F90

@@ -5 +5 @@
 
 SUBROUTINE cv3_param(nd, delt)
+
+  use mod_phys_lmdz_para
   IMPLICIT NONE
 
@@ -91 +93 @@
     betad = 10.0 ! original value (from convect 4.3)
 
+   !$OMP MASTER
     OPEN (99, FILE='conv_param.data', STATUS='old', FORM='formatted', ERR=9999)
     READ (99, *, END=9998) dpbase
@@ -124 +127 @@
     WRITE (*, *) 'tlcrit=', tlcrit
 ! IM end: ajout fis. reglage ep
+  !$OMP END MASTER
+
+   CALL bcast(dpbase)
+   CALL bcast(pbcrit)
+   CALL bcast(ptcrit)
+   CALL bcast(sigdz)
+   CALL bcast(spfac)
+   CALL bcast(tau)
+   CALL bcast(flag_wb)
+   CALL bcast(wbmax)
+
+   CALL bcast(flag_epkeorig)
+   CALL bcast(elcrit)
+   CALL bcast(tlcrit)
 
     first = .FALSE.
@@ -129 +146 @@
   END IF ! (first)
 
-! print*,'tau=',tau
   beta = 1.0 - delt/tau
   alpha1 = 1.5E-3
@@ -978 +994 @@
 ! Calcul de la quantité d'eau sous forme de glace
 ! --------------------------------------------------------------------
+  INTEGER nl, len
   REAL qi(len, nl)
   REAL t(len, nl), clw(len, nl)
   REAL fracg
-  INTEGER nl, len, k, i
+  INTEGER k, i
 
   DO k = 3, nl