Changeset 644 for LMDZ4/trunk/libf/dyn3d

Timestamp:

May 25, 2005, 3:10:09 PM (20 years ago)

Author:

Laurent Fairhead

Message:

Synchronisation avec tous les diagnostiques de Ionela IM
Inclusion du slab ocean IM
LF

Location:

LMDZ4/trunk/libf/dyn3d

Files:

• PVteta.F (added)
• advx.F (modified) (2 diffs)
• advz.F (modified) (2 diffs)
• calfis.F (modified) (3 diffs)
• etat0_netcdf.F (modified) (4 diffs)
• guide.F (modified) (1 diff)
• startvar.F (modified) (1 diff)
• tetaleveli1j.F (added)
• tetaleveli1j1.F (added)
• tourabs.F (added)

LMDZ4/trunk/libf/dyn3d/advx.F

@@ -106 +106 @@
          DO j = 1,jjp1
             DO i = 1,iim
-               sqi = sqi + S0(i,j,l,9)
+cIM 240305            sqi = sqi + S0(i,j,l,9)
+               sqi = sqi + S0(i,j,l,ntra)
             ENDDO
          ENDDO
@@ -483 +484 @@
         DO j = 1, jjp1
           DO i = 1, iim
-             sqf = sqf + S0(i,j,l,9)
+cIM 240405          sqf = sqf + S0(i,j,l,9)
+             sqf = sqf + S0(i,j,l,ntra)
           END DO  
         END DO

LMDZ4/trunk/libf/dyn3d/advz.F

@@ -105 +105 @@
          DO j = 1,jjp1
             DO i = 1,iim
-               sqi = sqi + S0(i,j,l,9)
+cIM 240305            sqi = sqi + S0(i,j,l,9)
+               sqi = sqi + S0(i,j,l,ntra)
             ENDDO
          ENDDO
@@ -307 +308 @@
          DO j = 1,jjp1
             DO i = 1,iim
-               sqf = sqf + S0(i,j,l,9)
+cIM 240305            sqf = sqf + S0(i,j,l,9)
+               sqf = sqf + S0(i,j,l,ntra)
             ENDDO
          ENDDO

LMDZ4/trunk/libf/dyn3d/calfis.F

@@ -162 +162 @@
       REAL zsinbis(iim),zcosbis(iim),z1bis(iim)
       REAL unskap, pksurcp
-
+c
+cIM diagnostique PVteta, Amip2
+      INTEGER ntetaSTD
+      PARAMETER(ntetaSTD=3)
+      REAL rtetaSTD(ntetaSTD)
+      DATA rtetaSTD/350., 380., 405./
+      REAL PVteta(ngridmx,ntetaSTD)
+c
 #ifdef INCA
       REAL flxw(iip1,jjp1,llm)
@@ -430 +437 @@
 
       ENDDO
-
-
+c
+cIM calcul PV a teta=350, 380, 405K
+      CALL PVtheta(ngridmx,llm,pucov,pvcov,pteta,
+     $           ztfi,zplay,zplev,
+     $           ntetaSTD,rtetaSTD,PVteta)
+c
 #ifdef INCA
       CALL gr_dyn_fi(llm,iip1,jjp1,ngridmx,flxw,flxwfi)
@@ -468 +479 @@
      .             zdtfi,
      .             zdqfi,
-     .             zdpsrf)
+     .             zdpsrf,
+cIM diagnostique PVteta, Amip2          
+     .             pducov,
+     .             PVteta)
 
 500   CONTINUE

LMDZ4/trunk/libf/dyn3d/etat0_netcdf.F

@@ -43 +43 @@
       REAL :: radsol(klon),rain_fall(klon), snow_fall(klon)
       REAL :: solsw(klon), sollw(klon), fder(klon)
-      REAL :: deltat(klon), frugs(klon,nbsrf), agesno(klon,nbsrf)
+cIM "slab" ocean
+      REAL :: tslab(klon), seaice(klon)
+      REAL :: frugs(klon,nbsrf), agesno(klon,nbsrf)
       REAL :: rugmer(klon)
       REAL :: zmea(iip1*jjp1), zstd(iip1*jjp1)
@@ -365 +367 @@
      .    jjm, rlonu, rlatv , interbar )
       !
-      varname = 'deltat'
-      deltat(:) = 0.0
-      CALL startget(varname,iip1,jjp1,rlonv,rlatu,klon,deltat,0.0,
+cIM "slab" ocean
+      varname = 'tslab'
+      tslab(:) = 0.0
+      CALL startget(varname,iip1,jjp1,rlonv,rlatu,klon,tslab,0.0,
+     .     jjm, rlonu, rlatv , interbar )
+c
+      varname = 'seaice'
+      seaice(:) = 0.0
+      CALL startget(varname,iip1,jjp1,rlonv,rlatu,klon,seaice,0.0,
      .     jjm, rlonu, rlatv , interbar )
       !
@@ -651 +659 @@
       q_ancien = 0.
       agesno = 0.
-      deltat = 0.
+cIM "slab" ocean
+      tslab(1:klon) = tsolsrf(1:klon,is_oce)
+      seaice = 0. !kg m-2
+c
       frugs(1:klon,is_oce) = rugmer(1:klon)
       frugs(1:klon,is_ter) = MAX(1.0e-05, zstd(1:klon)*zsig(1:klon)/2.0)
@@ -664 +675 @@
 cIM   call phyredem("startphy.nc",phystep,radpas, co2_ppm, solaire,
       call phyredem("startphy.nc",phystep,radpas,
-     $    latfi, lonfi, pctsrf, tsolsrf, tsoil, deltat, qsolsrf, qsol, 
+     $    latfi, lonfi, pctsrf, tsolsrf, tsoil, tslab, seaice, 
+     $    qsolsrf, qsol,
      $    snsrf, 
      $    albe, alblw, evap, rain_fall, snow_fall, solsw, sollw, fder,

LMDZ4/trunk/libf/dyn3d/guide.F

@@ -81 +81 @@
       INTEGER step_rea,count_no_rea
 
+cIM 180305   real aire_min,aire_max
       integer ilon,ilat
       real factt,ztau(ip1jmp1)

LMDZ4/trunk/libf/dyn3d/startvar.F

@@ -521 +521 @@
             CASE ('snow')
                   champ(:) = 0.0
-            CASE ('deltat')
+cIM "slab" ocean
+            CASE ('tslab')
+                   champ(:) = 0.0
+            CASE ('seaice')
                   champ(:) = 0.0
             CASE ('rugmer')