New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 6137 – NEMO

Changeset 6137


Ignore:
Timestamp:
2015-12-21T10:37:39+01:00 (8 years ago)
Author:
acc
Message:

Branch 2015/dev_r5803_NOC_WAD. Submit final changes after initial Irish Sea test and before attempting merge with dev_merge_2015 branch.

Location:
branches/2015/dev_r5803_NOC_WAD/NEMOGCM/NEMO
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/2015/dev_r5803_NOC_WAD/NEMOGCM/NEMO/OFF_SRC/domrea.F90

    r5870 r6137  
    680680 
    681681 
    682       IF( nprint == 1 .AND. lwp ) THEN 
    683          WRITE(numout,*) '          e1u e2u ' 
    684          CALL prihre( e1u,jpi,jpj,jpi-5,jpi,1,jpj-5,jpj,1,0.,numout ) 
    685          CALL prihre( e2u,jpi,jpj,jpi-5,jpi,1,jpj-5,jpj,1,0.,numout ) 
    686          WRITE(numout,*) '          e1v e2v  ' 
    687          CALL prihre( e1v,jpi,jpj,jpi-5,jpi,1,jpj-5,jpj,1,0.,numout ) 
    688          CALL prihre( e2v,jpi,jpj,jpi-5,jpi,1,jpj-5,jpj,1,0.,numout ) 
    689       ENDIF 
    690  
    691682      IF(lwp) THEN 
    692683         WRITE(numout,*) 
    … …  
    836827      END DO 
    837828      ! 
    838       IF( nprint == 1 .AND. lwp ) THEN    ! Control print 
    839          imsk(:,:) = INT( tmask_i(:,:) ) 
    840          WRITE(numout,*) ' tmask_i : ' 
    841          CALL prihin( imsk(:,:), jpi, jpj, 1, jpi, 1, 1, jpj, 1, 1, numout) 
    842          WRITE (numout,*) 
    843          WRITE (numout,*) ' dommsk: tmask for each level' 
    844          WRITE (numout,*) ' ----------------------------' 
    845          DO jk = 1, jpk 
    846             imsk(:,:) = INT( tmask(:,:,jk) ) 
    847             WRITE(numout,*) 
    848             WRITE(numout,*) ' level = ',jk 
    849             CALL prihin( imsk(:,:), jpi, jpj, 1, jpi, 1, 1, jpj, 1, 1, numout) 
    850          END DO 
    851       ENDIF 
    852       ! 
    853829      CALL wrk_dealloc( jpi, jpj, imsk ) 
    854830      ! 

  • branches/2015/dev_r5803_NOC_WAD/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

    r5870 r6137  
    170170 
    171171      ! Add vertical grid bounds 
    172       z_bnds(:      ,1) = gdepw_1d(:) 
    173       z_bnds(1:jpkm1,2) = gdepw_1d(2:jpk) 
    174       z_bnds(jpk:   ,2) = gdepw_1d(jpk) + e3t_1d(jpk) 
    175       CALL iom_set_axis_attr( "deptht", bounds=z_bnds ) 
    176       CALL iom_set_axis_attr( "depthu", bounds=z_bnds ) 
    177       CALL iom_set_axis_attr( "depthv", bounds=z_bnds ) 
    178       z_bnds(:    ,2) = gdept_1d(:) 
    179       z_bnds(2:jpk,1) = gdept_1d(1:jpkm1) 
    180       z_bnds(1    ,1) = gdept_1d(1) - e3w_1d(1) 
    181       CALL iom_set_axis_attr( "depthw", bounds=z_bnds ) 
     172      IF( ln_cfmeta ) THEN 
     173         z_bnds(:      ,1) = gdepw_1d(:) 
     174         z_bnds(1:jpkm1,2) = gdepw_1d(2:jpk) 
     175         z_bnds(jpk:   ,2) = gdepw_1d(jpk) + e3t_1d(jpk) 
     176         CALL iom_set_axis_attr( "deptht", bounds=z_bnds ) 
     177         CALL iom_set_axis_attr( "depthu", bounds=z_bnds ) 
     178         CALL iom_set_axis_attr( "depthv", bounds=z_bnds ) 
     179         z_bnds(:    ,2) = gdept_1d(:) 
     180         z_bnds(2:jpk,1) = gdept_1d(1:jpkm1) 
     181         z_bnds(1    ,1) = gdept_1d(1) - e3w_1d(1) 
     182         CALL iom_set_axis_attr( "depthw", bounds=z_bnds ) 
     183      ENDIF 
    182184 
    183185# if defined key_floats 
Note: See TracChangeset for help on using the changeset viewer.