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 4148 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 – NEMO

Ignore:
Timestamp:
2013-11-04T13:54:28+01:00 (10 years ago)
Author:
cetlod
Message:

merge in trunk changes between r3853 and r3940 and commit the changes, see ticket #1169

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

    r4147 r4148  
    350350               DO jn = 1, nptr 
    351351                  tn_jk(:,:,jn) = ptr_tjk( tsn(:,:,:,jp_tem), btmsk(:,:,jn) ) * r1_sjk(:,:,jn) 
     352                  sn_jk(:,:,jn) = ptr_tjk( tsn(:,:,:,jp_sal), btmsk(:,:,jn) ) * r1_sjk(:,:,jn) 
    352353               END DO 
    353354            ENDIF 
     
    570571      !!--------------------------------------------------------------------  
    571572      ! 
    572       CALL wrk_alloc( jpi      , zphi , zfoo ) 
    573       CALL wrk_alloc( jpi , jpk, z_1 ) 
     573      CALL wrk_alloc( jpj      , zphi , zfoo ) 
     574      CALL wrk_alloc( jpj , jpk, z_1 ) 
    574575 
    575576      ! define time axis 
     
    885886      ENDIF 
    886887      ! 
    887       CALL wrk_dealloc( jpi      , zphi , zfoo ) 
    888       CALL wrk_dealloc( jpi , jpk, z_1 ) 
     888      CALL wrk_dealloc( jpj      , zphi , zfoo ) 
     889      CALL wrk_dealloc( jpj , jpk, z_1 ) 
    889890      ! 
    890891  END SUBROUTINE dia_ptr_wri 
Note: See TracChangeset for help on using the changeset viewer.