Changeset 2334

Timestamp:

Jul 24, 2015, 7:32:31 PM (9 years ago)

Author:

lguez

Message:

Bug fix. maase, pbaru and pbarv cannot be intent(in) in caldyn0
because they are modified in caldyn0 (masse is computed by massdair
and pbaru, pbarv are computed by flumass). Also masse is already
computed in etat0dyn_netcdf, and the difference with the computation
in caldyn0 is the averaging at the poles. If we do not want to lose
this averaging, we should not overwrite masse with an output argument
from caldyn0. So the simplest thing to do is to downgrade masse from
argument to local variable of caldyn0. We also simply downgrade pbaru,
pbarv from arguments to local variables of caldyn0.

Location:

LMDZ5/trunk/libf

Files:

• dyn3d_common/caldyn0.F90 (modified) (2 diffs)
• dynlonlat_phylonlat/phylmd/etat0dyn_netcdf.F90 (modified) (1 diff)

LMDZ5/trunk/libf/dyn3d_common/caldyn0.F90

@@ -1 @@
-SUBROUTINE caldyn0(itau,ucov,vcov,teta,ps,masse,pk,phis,phi,w,pbaru,pbarv,time)
+SUBROUTINE caldyn0(itau,ucov,vcov,teta,ps,pk,phis,phi,w,time)
 !
 !-------------------------------------------------------------------------------
@@ -20 +20 @@
   REAL,    INTENT(IN)  :: teta (ip1jmp1  ,llm)      !--- POTENTIAL TEMPERATURE
   REAL,    INTENT(IN)  :: ps   (ip1jmp1)            !--- GROUND PRESSURE
-  REAL,    INTENT(IN)  :: masse(ip1jmp1  ,llm)      !--- MASS IN EACH CELL
   REAL,    INTENT(IN)  :: pk   (iip1,jjp1,llm)      !--- PRESSURE
   REAL,    INTENT(IN)  :: phis (ip1jmp1)            !--- GROUND GEOPOTENTIAL
   REAL,    INTENT(IN)  :: phi  (ip1jmp1  ,llm)      !--- 3D GEOPOTENTIAL
   REAL,    INTENT(OUT) :: w    (ip1jmp1  ,llm)      !--- VERTICAL WIND
-  REAL,    INTENT(IN)  :: pbaru(ip1jmp1  ,llm)      !--- U MASS FLUX
-  REAL,    INTENT(IN)  :: pbarv(ip1jm    ,llm)      !--- V MASS FLUX
   REAL,    INTENT(IN)  :: time                      !--- TIME
 !===============================================================================
 ! Local variables:
+  REAL masse(ip1jmp1  ,llm)      !--- MASS IN EACH CELL
+  REAL pbaru(ip1jmp1  ,llm)      !--- U MASS FLUX
+  REAL pbarv(ip1jm    ,llm)      !--- V MASS FLUX
   REAL, DIMENSION(ip1jmp1,llmp1) :: p
   REAL, DIMENSION(ip1jmp1,llm)   :: ucont, massebx, ang, ecin, convm, bern

LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/etat0dyn_netcdf.F90

@@ -215 +215 @@
   CALL geopot( ip1jmp1, tpot, pk, pks, phis, phi )
   WRITE(lunout,*)'sortie geopot'
-  CALL caldyn0( itau, uvent, vvent, tpot, psol, masse, pk, phis,               &
-                phi,  w, pbaru, pbarv, time+iday-dayref)
+  CALL caldyn0( itau, uvent, vvent, tpot, psol, pk, phis,               &
+                phi,  w, time+iday-dayref)
   WRITE(lunout,*)'sortie caldyn0'     
   CALL dynredem0( "start.nc", dayref, phis)