Changeset 940 for LMDZ4/trunk/libf/phylmd/cva_driver.F

Timestamp:

Apr 7, 2008, 4:33:30 PM (16 years ago)

Author:

Laurent Fairhead

Message:

On remplace le fichier include dimphy.h par le module dimphy.F90i pour etre
coherent avec le partout
LF

File:

• LMDZ4/trunk/libf/phylmd/cva_driver.F (modified) (7 diffs)

LMDZ4/trunk/libf/phylmd/cva_driver.F

@@ -1 @@
-      SUBROUTINE cva_driver(len,nd,ndp1,ntra,iflag_con,iflag_mix,
+      SUBROUTINE cva_driver(len,nd,ndp1,ntra,nloc,
+     &                   iflag_con,iflag_mix,
      &                   iflag_clos,delt,
      &                   t1,q1,qs1,t1_wake,q1_wake,qs1_wake,
@@ -26 +27 @@
 ***************************************************************
 C
+      USE dimphy
       implicit none
 C
@@ -102 +104 @@
 c
 #include "dimensions.h"
-#include "dimphy.h"
+ccccc#include "dimphy.h"
 c
 c Input
@@ -344 +346 @@
 c
       integer nloc
-      parameter (nloc=klon) ! pour l'instant
+c      parameter (nloc=klon) ! pour l'instant
 
       integer idcum(nloc)
@@ -381 +383 @@
       real supmax(nloc,klev)
       real ale(nloc),alp(nloc),coef_clos(nloc)
-      real mp(nloc,klev), qp(nloc,klev), up(nloc,klev), vp(nloc,klev)
-      real wt(nloc,klev), water(nloc,klev), evap(nloc,klev)
-      real b(nloc,klev), sigd(nloc)
-      save mp,qp,up,vp,wt,water,evap,b
+      real sigd(nloc)
+!      real mp(nloc,klev), qp(nloc,klev), up(nloc,klev), vp(nloc,klev)
+!      real wt(nloc,klev), water(nloc,klev), evap(nloc,klev)
+!      real b(nloc,klev), sigd(nloc)
+!      save mp,qp,up,vp,wt,water,evap,b
+      real, save, allocatable :: mp(:,:),qp(:,:),up(:,:),vp(:,:)
+      real, save, allocatable :: wt(:,:),water(:,:),evap(:,:), b(:,:)
+c$OMP THREADPRIVATE(mp,qp,up,vp,wt,water,evap,b)
       real  ft(nloc,klev), fq(nloc,klev)
       real ftd(nloc,klev), fqd(nloc,klev)
@@ -405 +411 @@
       real wghti(nloc,nd)
       real hnk(nloc),unk(nloc),vnk(nloc)
+      logical, save :: first=.true.
 
 c
@@ -414 +421 @@
 !-------------------------------------------------------------------
 
+       if (first) then
+         allocate(mp(nloc,klev), qp(nloc,klev), up(nloc,klev))
+         allocate(vp(nloc,klev), wt(nloc,klev), water(nloc,klev))
+         allocate(evap(nloc,klev), b(nloc,klev))
+         first=.false.
+       endif
 c -- set simulation flags:
 c   (common cvflag)