Ignore:
Timestamp:
Nov 28, 2014, 4:36:29 PM (10 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/surf_land_orchidee_mod.F90

    r2056 r2160  
    614614          correspond(ij,jj) = igrid
    615615       ENDDO
     616!sonia : Les mailles des voisines doivent etre toutes egales (pour couplage orchidee)
     617       IF (knon_glo == 1) THEN
     618         igrid = 1
     619         DO i = 1,8
     620           neighbours_glo(igrid, i) = igrid
     621         ENDDO
     622       ELSE
     623       print*,'sonia : knon_glo,ij,jj', knon_glo, ij,jj
    616624       
    617625       DO igrid = 1, knon_glo
    … …  
    636644          ENDDO
    637645       ENDDO
     646       ENDIF !fin knon_glo == 1
    638647
    639648    ENDIF
Note: See TracChangeset for help on using the changeset viewer.