Changeset 352 for LMDZ.3.3/branches/rel-LF/libf/dyn3d

Timestamp:

Mar 21, 2002, 4:09:30 PM (23 years ago)

Author:

lmdzadmin

Message:

2 changements pour les fichiers histoire:

• utilisation de l'entree "rectilineaire" de IOIPSL pour ne plus avoir a lancer ncregular a chaque fois
• le calendrier des fichiers histoire est maintenant base sur la date d'initialisation de la simulation plutot que sur la date de depart du job en cours

LF

File:

• LMDZ.3.3/branches/rel-LF/libf/dyn3d/etat0_netcdf.F (modified) (11 diffs)

LMDZ.3.3/branches/rel-LF/libf/dyn3d/etat0_netcdf.F

@@ -23 +23 @@
 #include "dimphy.h"
 #include "dimsoil.h"
+#include "temps.h"
       !
       LOGICAL interbar
@@ -38 +39 @@
       REAL :: tsoil(klon,nsoilmx,nbsrf) 
       REAL :: radsol(klon),rain_fall(klon), snow_fall(klon)
-      REAL :: solsw(klon), sollw(klon)
-      REAL :: deltat(klon), frugs(klon,nbsrf), agesno(klon),rugmer(klon)
+      REAL :: solsw(klon), sollw(klon), fder(klon)
+      REAL :: deltat(klon), frugs(klon,nbsrf), agesno(klon,nbsrf)
+      REAL :: rugmer(klon)
       REAL :: zmea(iip1*jjp1), zstd(iip1*jjp1)
       REAL :: zsig(iip1*jjp1), zgam(iip1*jjp1), zthe(iip1*jjp1)
@@ -50 +52 @@
       INTEGER :: iml_lic, jml_lic, llm_tmp, ttm_tmp, iret
       INTEGER :: itaul(1), fid
-      REAL :: lev(1), date, dt
+      REAL :: lev(1), date
       REAL, ALLOCATABLE, DIMENSION(:,:) :: lon_lic, lat_lic
       REAL, ALLOCATABLE, DIMENSION(:)  :: dlon_lic, dlat_lic
@@ -193 +195 @@
       pctsrf=0.
       !cree le masque a partir du fichier relief
-      varname = 'zmasq'
-      zmasq(:) = 0.
-      CALL startget(varname,iip1,jjp1,rlonv,rlatu,klon,zmasq,0.0,
-     , jjm ,rlonu,rlatv , interbar )
+      call gr_dyn_fi(1, iip1, jjp1, klon, masque, zmasq)
       WHERE (zmasq(1 : klon) .LT. EPSFRA)
           zmasq(1 : klon) = 0.
@@ -323 +322 @@
      .     jjm, rlonu, rlatv , interbar )
       !
-      varname = 'agsno'
-      agesno(:) = 0.0
-      CALL startget(varname,iip1,jjp1,rlonv,rlatu,klon,agesno,0.0,
-     .     jjm, rlonu, rlatv , interbar )
+!      varname = 'agesno'
+!      agesno(:) = 0.0
+!      CALL startget(varname,iip1,jjp1,rlonv,rlatu,klon,agesno,0.0,
+!     .     jjm, rlonu, rlatv , interbar )
 
       varname = 'zmea'
@@ -511 +510 @@
       ENDIF 
 
+!      where (pctsrf(1:klon, is_ter) >= .5) 
+!        pctsrf(1:klon, is_ter) = 1.
+!        pctsrf(1:klon, is_oce) = 0.
+!        pctsrf(1:klon, is_sic) = 0.
+!        pctsrf(1:klon, is_lic) = 0.
+!        zmasq = 1.
+!      endwhere
+!      where (pctsrf(1:klon, is_lic) >= .5) 
+!        pctsrf(1:klon, is_ter) = 0.
+!        pctsrf(1:klon, is_oce) = 0.
+!        pctsrf(1:klon, is_sic) = 0.
+!        pctsrf(1:klon, is_lic) = 1.
+!        zmasq = 1.
+!      endwhere
+!      where (pctsrf(1:klon, is_oce) >= .5) 
+!        pctsrf(1:klon, is_ter) = 0.
+!        pctsrf(1:klon, is_oce) = 1.
+!        pctsrf(1:klon, is_sic) = 0.
+!        pctsrf(1:klon, is_lic) = 0.
+!        zmasq = 0.
+!      endwhere
+!      where (pctsrf(1:klon, is_sic) >= .5) 
+!        pctsrf(1:klon, is_ter) = 0.
+!        pctsrf(1:klon, is_oce) = 0.
+!        pctsrf(1:klon, is_sic) = 1.
+!        pctsrf(1:klon, is_lic) = 0.
+!        zmasq = 0.
+!      endwhere
+!      call gr_fi_dyn(1, klon, iip1, jjp1, zmasq, masque)
+C
+C verif que somme des sous surface = 1
+C
+!      ji=count( (abs( sum(pctsrf(1 : klon, 1 : nbsrf), dim = 2)) - 1.0 ) 
+!     $    .GT. EPSFRA)
+!      IF (ji .NE. 0) THEN
+!          WRITE(*,*) 'pb repartition sous maille pour ',ji,' points'
+!     ENDIF 
 
 
@@ -544 +580 @@
       print*,'sortie inidissip'
       itau = 0
+      itau_dyn = 0
+      itau_phy = 0
       iday = dayref +itau/day_step
       time = FLOAT(itau-(iday-dayref)*day_step)/day_step
@@ -551 +589 @@
        iday = iday + 1
       ENDIF
+      day_ref = dayref
+      annee_ref = anneeref
+
       CALL geopot  ( ip1jmp1, tpot  , pk , pks,  phis  , phi   )
       print*,'sortie geopot'
@@ -557 +598 @@
      *                phi,w, pbaru,pbarv,time+iday-dayref   )
        print*,'sortie caldyn0'     
-      CALL dynredem0("start.nc",dayref,anneeref,phis,nqmx)
+      CALL dynredem0("start.nc",dayref,phis,nqmx)
       print*,'sortie dynredem0'
       CALL dynredem1("start.nc",0.0,vvent,uvent,tpot,q3d,nqmx,masse ,
@@ -569 +610 @@
       co2_ppm   = 330.0
       solaire   = 1370.0
-
-c      call physdem(lonfi, latfi, phystep,radpas,co2_ppm,
-c     .                   solaire,tsol, qsol,
-c     .                   sn, radsol, deltat, rugmer,
-c     .                   agesno, zmea, zstd, zsig,
-c     .                   zgam, zthe, zpic, zval,
-c     .                   rugsrel)
 
 c
@@ -614 +648 @@
       frugs(1:klon,is_lic) = MAX(1.0e-05, zstd(1:klon)*zsig(1:klon)/2.0)
       frugs(1:klon,is_sic) = 0.001
-
-      call physdem("startphy.nc",phystep,radpas, co2_ppm, solaire,
+      fder = 0.0
+
+      call phyredem("startphy.nc",phystep,radpas, co2_ppm, solaire,
      $    latfi, lonfi, pctsrf, tsolsrf, tsoil, deltat, qsolsrf, snsrf, 
-     $    albe, evap, rain_fall, snow_fall, solsw, sollw, 
+     $    albe, evap, rain_fall, snow_fall, solsw, sollw, fder,
      $    radsol, frugs,  agesno, 
      $    zmea, zstd, zsig, zgam, zthe, zpic, zval, rugsrel,