Changeset 1301 for trunk/LMDZ.VENUS/libf/phyvenus/newstart.F

Timestamp:

Jun 26, 2014, 12:25:31 PM (10 years ago)

Author:

slebonnois

Message:

SL: many bug corrections in phyvenus, some cleaning, and a new ksi matrix format for Venus IR

File:

• trunk/LMDZ.VENUS/libf/phyvenus/newstart.F (modified) (13 diffs)

trunk/LMDZ.VENUS/libf/phyvenus/newstart.F

@@ -69 +69 @@
       REAL tsurf(ngridmx),tsoil(ngridmx,nsoilmx)
       REAL albe(ngridmx),radsol(ngridmx),sollw(ngridmx)
-      real solsw(ngridmx),dlw(ngridmx)
+      real solsw(ngridmx),fder(ngridmx)
+      real sollwdown(ngridmx),dlw(ngridmx)
       REAL zmea(ngridmx), zstd(ngridmx)
       REAL zsig(ngridmx), zgam(ngridmx), zthe(ngridmx)
@@ -84 +85 @@
       real tsurfS(iip1,jjp1),tsoilS(iip1,jjp1,nsoilmx)
       real albeS(ip1jmp1),radsolS(ip1jmp1),sollwS(ip1jmp1)
-      real solswS(ip1jmp1),dlwS(ip1jmp1)
+      real solswS(ip1jmp1),fderS(ip1jmp1)
+      real sollwdownS(ip1jmp1),dlwS(ip1jmp1)
       real zmeaS(ip1jmp1),zstdS(ip1jmp1),zsigS(ip1jmp1)
       real zgamS(ip1jmp1),ztheS(ip1jmp1),zpicS(ip1jmp1)
@@ -116 +118 @@
       real, dimension(:,:),   allocatable :: albeold,radsolold
       real, dimension(:,:),   allocatable :: sollwold,solswold
-      real, dimension(:,:),   allocatable :: dlwold
+      real, dimension(:,:),   allocatable :: fderold
+      real, dimension(:,:),   allocatable :: dlwold,sollwdownold
       real, dimension(:,:),   allocatable :: zmeaold,zstdold,zsigold
       real, dimension(:,:),   allocatable :: zgamold,ztheold,zpicold
@@ -135 +138 @@
       integer, dimension(4) :: start,counter
       REAL phisinverse(iip1,jjp1)  ! geopotentiel au sol avant inversion
-      logical topoflag,albedoflag,razvitu
+      logical topoflag,albedoflag,razvitu,razvitv 
       real    albedo
       
@@ -318 +321 @@
       allocate(albeold(imold+1,jmold+1),radsolold(imold+1,jmold+1))
       allocate(sollwold(imold+1,jmold+1),solswold(imold+1,jmold+1))
-      allocate(dlwold(imold+1,jmold+1))
+      allocate(fderold(imold+1,jmold+1))
+      allocate(sollwdownold(imold+1,jmold+1),dlwold(imold+1,jmold+1))
       allocate(zmeaold(imold+1,jmold+1),zstdold(imold+1,jmold+1))
       allocate(zsigold(imold+1,jmold+1),zgamold(imold+1,jmold+1))
@@ -616 +620 @@
       ENDIF
 c
+      ierr = NF_INQ_VARID (nid, "fder", nvarid)
+      IF (ierr .NE. NF_NOERR) THEN
+         PRINT*, "lect_start_archive: Le champ <fder> est absent"
+         CALL abort
+      ENDIF
+#ifdef NC_DOUBLE
+      ierr = NF_GET_VARA_DOUBLE(nid, nvarid,start,counter,fderold)
+#else
+      ierr = NF_GET_VARA_REAL(nid, nvarid,start,counter,fderold)
+#endif
+      IF (ierr .NE. NF_NOERR) THEN
+         PRINT*, "lect_start_archive: Lecture echouee pour <fder>"
+         CALL abort
+      ENDIF
+c
       ierr = NF_INQ_VARID (nid, "dlw", nvarid)
       IF (ierr .NE. NF_NOERR) THEN
@@ -628 +647 @@
       IF (ierr .NE. NF_NOERR) THEN
          PRINT*, "lect_start_archive: Lecture echouee pour <dlw>"
+         CALL abort
+      ENDIF
+c
+      ierr = NF_INQ_VARID (nid, "sollwdown", nvarid)
+      IF (ierr .NE. NF_NOERR) THEN
+         PRINT*, "lect_start_archive: Le champ <sollwdown> est absent"
+         CALL abort
+      ENDIF
+#ifdef NC_DOUBLE
+      ierr = NF_GET_VARA_DOUBLE(nid, nvarid,start,counter,sollwdownold)
+#else
+      ierr = NF_GET_VARA_REAL(nid, nvarid,start,counter,sollwdownold)
+#endif
+      IF (ierr .NE. NF_NOERR) THEN
+         PRINT*, "lect_start_archive: Lecture echouee pour <sollwdown>"
          CALL abort
       ENDIF
@@ -844 +878 @@
        topoflag = . FALSE .
        CALL getin('topoflag',topoflag)
+
+        print*,zmeaold(2,1:10)
 
        IF ( topoflag ) then
@@ -952 +988 @@
       call gr_dyn_fi (1,iip1,jjp1,ngridmx,solswS,solsw)
 
+      call interp_horiz (fderold,fderS,imold,jmold,iim,jjm,1,
+     &                   rlonuold,rlatvold,rlonu,rlatv)
+      call gr_dyn_fi (1,iip1,jjp1,ngridmx,fderS,fder)
+
       call interp_horiz (dlwold,dlwS,imold,jmold,iim,jjm,1,
      &                   rlonuold,rlatvold,rlonu,rlatv)
       call gr_dyn_fi (1,iip1,jjp1,ngridmx,dlwS,dlw)
+
+      call interp_horiz (sollwdownold,sollwdownS,imold,jmold,iim,jjm,1,
+     &                   rlonuold,rlatvold,rlonu,rlatv)
+      call gr_dyn_fi (1,iip1,jjp1,ngridmx,sollwdownS,sollwdown)
 
       print*,"Nouvelles var physiques OK"
@@ -1044 +1088 @@
        razvitu = . FALSE .
        CALL getin('razvitu',razvitu)
+       razvitv = . FALSE .
+       CALL getin('razvitv',razvitv)
 
 c calcul des champ de vent; passage en vent covariant
@@ -1053 +1099 @@
       call interp_horiz(var,us,imold,jmold,iim,jjm,llm,
      &                   rlonuold,rlatvold,rlonu,rlatv)
-      write (*,*) 'us ', us (1,2,1)   ! INFO
+      write (*,*) 'us ', us (1,2,1)    ! INFO
 
       call interp_vert
@@ -1078 +1124 @@
       write (*,*) 'ucov ', ucov (1,2,1)  ! INFO
 c     write(48,*) 'ucov',ucov
+! Reseting v=0
+      if (razvitv) then
+           vnat(:,:,:) = 0.
+      endif
+      write (*,*) 'vnat ', vnat (1,2,1)    ! INFO
       do l=1,llm
         do j = 1, jjm
@@ -1114 +1165 @@
 
       call writerestartphy('restartphy.nc',tab_cntrl_fi,ngridmx,llm,
-     .           rlat,rlon,tsurf,tsoil,albe,solsw, sollw,dlw,
-     .           radsol,
+     .           rlat,rlon,tsurf,tsoil,albe,solsw, sollw,fder,dlw,
+     .           sollwdown,radsol,
      .           zmea,zstd,zsig,zgam,zthe,zpic,zval,
      .           t_fi)