Changeset 360


Ignore:
Timestamp:
May 24, 2002, 3:54:35 PM (22 years ago)
Author:
lmdzadmin
Message:

Orchidee utilise psol plutot que p1lay (commentaire erroné dans intersurf)
LF

File:
1 edited

Legend:

Unmodified
Added
Removed
  • LMDZ.3.3/branches/rel-LF/libf/phylmd/interface_surf.F90

    r353 r360  
    354354     &  tq_cdrag, petAcoef, peqAcoef, petBcoef, peqBcoef, &
    355355     &  precip_rain, precip_snow, sollwdown, swnet, swdown, &
    356      &  tsurf, p1lay/100., ps, radsol, &
     356     &  tsurf, p1lay/100., ps/100., radsol, &
    357357     &  evap, fluxsens, fluxlat, &             
    358358     &  tsol_rad, tsurf_new, alb_new, alblw, &
     
    844844! Attention aux poles
    845845!
    846 !!$    do igrid = 1, knon
    847 !!$      index = ktindex(igrid)
    848 !!$      ij = index - int((index-1)/iim)*iim - 1
    849 !!$      jj = 2 + int((index-1)/iim)
    850 !!$      if (mod(index,iim) == 1 ) then
    851 !!$        jj = 1 + int((index-1)/iim)
    852 !!$        ij = iim
    853 !!$      endif
    854 !!$      correspond(ij,jj) = igrid
    855 !!$      write(50,*)'igrid, i, j =',igrid,ij,jj
    856 !!$    enddo
    857 ! Pb de correspondances de grilles!
    858 !!$    do igrid = 1, knon
    859 !!$      index = ktindex(igrid)
    860 !!$      ij = ig(index)
    861 !!$      jj = jg(index)
    862 !!$      correspond(ij,jj) = igrid
    863 !!$      write(51,*)'igrid, i, j =',igrid,ij,jj
    864 !!$    enddo
    865846    do igrid = 1, knon
    866847      index = ktindex(igrid)
     
    869850      correspond(ij,jj) = igrid
    870851    enddo
    871 
    872 !!$    index = 0
    873 !!$    do jj = 1, jjm+1
    874 !!$      do ij = 1, iim
    875 !!$        index = index + 1
    876 !!$        correspond(ij,jj) = index
    877 !!$      enddo
    878 !!$    enddo
    879852
    880853! Allouer et initialiser le tableau de coordonnees du sol
     
    973946        index = iglob + offset(i)
    974947        ireal = (min(max(1, index - iim + 1), klon))
    975 !        if (index <= 1) index = 1
    976 !        if (index >= klon) index = klon
    977948        if (pctsrf(ireal, is_ter) > EPSFRA) then
    978949          jj = int((index - 1)/iim) + 1
    979950          ij = index - (jj - 1) * iim
    980 !!$          ij = index - int((index-1)/iim)*iim - 1
    981 !!$          jj = 2 + int((index-1)/iim)
    982 !!$          if (mod(index,iim) == 1 ) then
    983 !!$            jj = 1 + int((index-1)/iim)
    984 !!$            ij = iim
    985 !!$          endif
    986 !!$! Pb de correspondances de grilles!
    987 !!$      ij = ig(index)
    988 !!$      jj = jg(index)
    989 !!$!          write(*,*)'correspond',igrid, ireal,index,ij,jj
    990 !          if ( ij >= 1 .and. ij <= iim .and. jj >= 1 .and. jj <= jjm) then
    991 !          write(*,*)'correspond',igrid, ireal,index,ij,jj
    992951            neighbours(igrid, i) = correspond(ij, jj)
    993 !          endif
    994952        endif
    995953      enddo
    996954    enddo
    997 
    998     write(*,*)'Neighbours = '
    999 
    1000     write(*,*)neighbours(1,8), neighbours(1,1),neighbours(1,2)
    1001     write(*,*)neighbours(1,7), ktindex(1), neighbours(1,3)
    1002     write(*,*)neighbours(1,6), neighbours(1,5),neighbours(1,4)
    1003 
    1004     write(*,*)neighbours(250,8), neighbours(250,1),neighbours(250,2)
    1005     write(*,*)neighbours(250,7), ktindex(250), neighbours(250,3)
    1006     write(*,*)neighbours(250,6), neighbours(250,5),neighbours(250,4)
    1007 
    1008  OPEN (unit=12, file="neighbours.9671")
    1009   DO i=1,knon
    1010      WRITE(12,*) '-----------------------------'
    1011      WRITE(12,'(I7,f8.5,   "    ",3I6)') knon, contfrac(i), &
    1012           & neighbours(i,8), neighbours(i,1), neighbours(i,2)
    1013      WRITE(12,'(f10.5,"         ",3I6)') lalo(i,2), neighbours(i,7), &
    1014           & ktindex(i), neighbours(i,3)
    1015      WRITE(12,'(f10.5,"         ",3I6)') lalo(i,1), neighbours(i,6), &
    1016           & neighbours(i,5), neighbours(i,3)
    1017   ENDDO
    1018   CLOSE(12)
    1019 
    1020955
    1021956!
     
    1064999     & zlev,  u1_lay, v1_lay, spechum, temp_air, epot_air, ccanopy, &
    10651000     & cdrag, petA_orc, peqA_orc, petB_orc, peqB_orc, &
    1066      & precip_rain, precip_snow, lwdown, swnet, swdown, p1lay, &
     1001     & precip_rain, precip_snow, lwdown, swnet, swdown, ps, &
    10671002     & evap, fluxsens, fluxlat, coastalflow, riverflow, &
    10681003     & tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, &
     
    10751010     & zlev,  u1_lay, v1_lay, spechum, temp_air, epot_air, ccanopy, &
    10761011     & cdrag, petA_orc, peqA_orc, petB_orc, peqB_orc, &
    1077      & precip_rain, precip_snow, lwdown, swnet, swdown, p1lay, &
     1012     & precip_rain, precip_snow, lwdown, swnet, swdown, ps, &
    10781013     & evap, fluxsens, fluxlat, coastalflow, riverflow, &
    10791014     & tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0_new, &
     
    10821017    bidule=0.
    10831018    bidule(1:knon)=riverflow(1:knon)
    1084     call gath2cpl(bidule, tmp_rriv, klon, knon,iim,jjm,                  ktindex)
     1019    call gath2cpl(bidule, tmp_rriv, klon, knon,iim,jjm,ktindex)
    10851020    bidule=0.
    10861021    bidule(1:knon)=coastalflow(1:knon)
    1087     call gath2cpl(bidule, tmp_rcoa, klon, knon,iim,jjm,                  ktindex)
     1022    call gath2cpl(bidule, tmp_rcoa, klon, knon,iim,jjm,ktindex)
    10881023    alb_new(1:knon) = albedo_out(1:knon,1)
    10891024    alblw(1:knon) = albedo_out(1:knon,2)
Note: See TracChangeset for help on using the changeset viewer.