Changeset 359

Timestamp:

May 24, 2002, 3:44:47 PM (23 years ago)

Author:

lmdzadmin

Message:

Menage sur les etats initiaux
LF

Location:

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

Files:

• etat0_netcdf.F (modified) (6 diffs)
• inter_bary.F (modified) (1 diff)
• limit_netcdf.F (modified) (1 diff)
• ord_coord.F (modified) (1 diff)
• sort.F (modified) (1 diff)
• startvar.F (modified) (1 diff)

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

@@ -107 +107 @@
       real, dimension(klon) :: ocemask_fi
       integer :: isst(klon-2)
-
+      real zx_tmp_2d(iim,jjp1)
       !
       !   Constantes 
@@ -184 +184 @@
        CALL startget(varname, iip1, jjp1, rlonv, rlatu, masque, 0.0,
      , jjm ,rlonu,rlatv , interbar )
+!      masque = nint(masque)
       !
       WRITE(*,*) 'MASQUE construit : Masque'
-!      WRITE(*,'(97I1)') nINT(masque(:,:))
+      WRITE(*,'(97I1)') nINT(masque(:,:))
       !
       !
@@ -203 +204 @@
           zmasq(1 : klon) = 1.
       END WHERE 
-
-
-
-
+c
       varname = 'psol'
       psol(:,:) = 0.0
@@ -408 +406 @@
 C passage masque ocean a la grille physique
 C
+
+        write(*,*)'ocemask '
+        write(*,'(96i1)')int(ocemask)
         ocemask_fi(1) = ocemask(1,1)
         do j = 2, jjm
@@ -549 +550 @@
 !     ENDIF 
 
+      CALL gr_fi_ecrit(1,klon,iim,jjp1,zmasq,zx_tmp_2d)
+      write(*,*)'zmasq = '
+      write(*,'(96i1)')nint(zx_tmp_2d)
+      call gr_fi_dyn(1, klon, iip1, jjp1, zmasq, masque)
+      WRITE(*,*) 'MASQUE construit : Masque'
+      WRITE(*,'(97I1)') nINT(masque(:,:))
 
 
@@ -607 +614 @@
 C Ecriture etat initial physique
 C
+      write(*,*)'phystep ',dtvr,iphysiq,nbapp_rad
       phystep   = dtvr * FLOAT(iphysiq)
       radpas    = NINT (86400./phystep/ FLOAT(nbapp_rad) )
+      write(*,*)'phystep =', phystep, radpas
       co2_ppm   = 330.0
       solaire   = 1370.0

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

@@ -38 +38 @@
 c  ....  Arguments  en sortie  .......
 c
-       REAL    fmod( 1 )
+       REAL    fmod( jmodmax + 1 )
 c
 c   ...... Variables locales  ......

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

@@ -231 +231 @@
       ENDDO
       ENDDO
+      WRITE(*,*) 'MASK:'
+      WRITE(*,'(96i1)')INT(mask)     
       ierr = NF_CLOSE(ncid)
 c

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

@@ -81 +81 @@
         
        IF( decrois )  THEN
-         CALL sort(nmax+1,xo(1))
+c         CALL sort(nmax+1,xo(1))
+        CALL sort(nmax+1,xo)
        ENDIF
 

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

@@ -13 +13 @@
 
       INTEGER n
-      REAL d(1) , p
+      REAL d(n) , p
       INTEGER i,j,k
 

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

@@ -426 +426 @@
               ENDIF
               CALL gr_dyn_fi(1, iml, jml, nbindex, psol_dyn, champ)
-    ! PB ajout pour masque terre mer fractionneiare    
-          CASE ('zmasq')
-              IF (.NOT. ALLOCATED(masque) ) THEN
-                  CALL start_init_orog ( iml, jml,lon_in, lat_in,
-     .              jml2, lon_in2,lat_in2 , interbar )
-              ENDIF
-              IF ( SIZE(masque) .NE. SIZE(lon_in)*SIZE(lat_in) ) THEN
-                WRITE(*,*)
-     . 'STARTVAR module has been initialized to the wrong size'
-                 STOP
-             ENDIF
-             CALL gr_dyn_fi(1, iml, jml, nbindex, masque, champ)
             CASE ('zmea')
               IF ( .NOT.ALLOCATED(relief)) THEN