Ignore:
Timestamp:
2019-09-20T17:28:02+02:00 (18 months ago)
Author:
gsamson
Message:

dev_r11265_ABL : see #2131

  • merge HPC-13_IRRMANN_BDY_optimization branch @ r11535 (last commit) with dev_r11265_ABL branch @ r11414 (except doc directory)
  • change ORCA2 results due to changes in HPC-13_IRRMANN_BDY_optimization branch
Location:
NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/OCE/IOM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/OCE/IOM/iom.F90

    r11413 r11586  
    3030#if defined key_iomput 
    3131   USE sbc_oce  , ONLY :   nn_fsbc, ght_abl, ghw_abl, e3t_abl, e3w_abl, jpka, jpkam1 
    32    USE trc_oce  , ONLY :   nn_dttrc                  ! frequency of step on passive tracers 
    33    USE icb_oce  , ONLY :   nclasses, class_num       ! iceberg classes 
     32   USE trc_oce  , ONLY :   nn_dttrc        !  !: frequency of step on passive tracers 
     33   USE icb_oce  , ONLY :   nclasses, class_num       !  !: iceberg classes 
    3434#if defined key_si3 
    3535   USE ice      , ONLY :   jpl 
     
    230230          za_bnds(2,:) = ght_abl(2:jpka  ) + e3w_abl(2:jpka) 
    231231          CALL iom_set_axis_attr( "ghw_abl", bounds=za_bnds ) 
     232 
    232233          CALL iom_set_axis_attr( "nfloat", (/ (REAL(ji,wp), ji=1,jpnfl) /) ) 
    233234# if defined key_si3 
     
    19601961      INTEGER :: icnr, jcnr                             ! Offset such that the vertex coordinate (i+icnr,j+jcnr) 
    19611962      !                                                 ! represents the bottom-left corner of cell (i,j) 
    1962       REAL(wp), DIMENSION(4,jpi,jpj,2) ::   z_bnds      ! Lat/lon coordinates of the vertices of cell (i,j) 
    1963       REAL(wp), DIMENSION(  jpi,jpj  ) ::   z_fld       ! Working array to determine where to rotate cells 
    1964       REAL(wp), DIMENSION(4        ,2) ::   z_rot       ! Lat/lon working array for rotation of cells 
    1965       !!---------------------------------------------------------------------- 
     1963      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) :: z_bnds      ! Lat/lon coordinates of the vertices of cell (i,j) 
     1964      REAL(wp), ALLOCATABLE, DIMENSION(:,:)     :: z_fld       ! Working array to determine where to rotate cells 
     1965      REAL(wp), ALLOCATABLE, DIMENSION(:,:)     :: z_rot       ! Lat/lon working array for rotation of cells 
     1966      !!---------------------------------------------------------------------- 
     1967      ! 
     1968      ALLOCATE( z_bnds(4,jpi,jpj,2), z_fld(jpi,jpj), z_rot(4,2)  ) 
    19661969      ! 
    19671970      ! Offset of coordinate representing bottom-left corner 
     
    20432046      CALL iom_set_domain_attr("grid_"//cdgrd, bounds_lat = RESHAPE(z_bnds(:,nldi:nlei,nldj:nlej,1),(/ 4,ni*nj /)),           & 
    20442047          &                                    bounds_lon = RESHAPE(z_bnds(:,nldi:nlei,nldj:nlej,2),(/ 4,ni*nj /)), nvertex=4 ) 
     2048      ! 
     2049      DEALLOCATE( z_bnds, z_fld, z_rot )  
    20452050      ! 
    20462051   END SUBROUTINE set_grid_bounds 
  • NEMO/branches/2019/dev_r11265_ASINTER-01_Guillaume_ABL1D/src/OCE/IOM/iom_nf90.F90

    r11223 r11586  
    196196      CHARACTER(len=*)     , INTENT(in   )           ::   cdvar    ! name of the variable 
    197197      INTEGER              , INTENT(in   )           ::   kiv   !  
    198       INTEGER, DIMENSION(:), INTENT(  out), OPTIONAL ::   kdimsz   ! size of the dimensions 
    199       INTEGER,               INTENT(  out), OPTIONAL ::   kndims   ! size of the dimensions 
     198      INTEGER, DIMENSION(:), INTENT(  out), OPTIONAL ::   kdimsz   ! size of each dimension 
     199      INTEGER              , INTENT(  out), OPTIONAL ::   kndims   ! number of dimensions 
    200200      LOGICAL              , INTENT(  out), OPTIONAL ::   lduld    ! true if the last dimension is unlimited (time) 
    201201      ! 
Note: See TracChangeset for help on using the changeset viewer.