Changeset 3255


Ignore:
Timestamp:
2012-01-09T16:54:41+01:00 (9 years ago)
Author:
charris
Message:

Fixes for diaptr because the btm30 array was not being allocated, and the arrays for advective and diffusive heat and salt transport were not properly initialised. However there still appear to be unresolved problems with some of these diagnostics in my tests.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

    r3208 r3255  
    9797      !!---------------------------------------------------------------------- 
    9898      INTEGER               ::   dia_ptr_alloc   ! return value 
    99       INTEGER, DIMENSION(5) ::   ierr 
     99      INTEGER, DIMENSION(6) ::   ierr 
    100100      !!---------------------------------------------------------------------- 
    101101      ierr(:) = 0 
     
    122122         &     ndex_h(jpj),          ndex_h_atl_30(jpj), ndex_h_pac_30(jpj), & 
    123123         &     ndex_h_ind_30(jpj),   ndex_h_ipc_30(jpj), Stat=ierr(5) ) 
     124         ! 
     125     ALLOCATE( btm30(jpi,jpj) , STAT=ierr(6)  ) 
    124126         ! 
    125127      dia_ptr_alloc = MAXVAL( ierr ) 
     
    511513         WHERE( sjk(:,:,jn) /= 0._wp )   r1_sjk(:,:,jn) = 1._wp / sjk(:,:,jn) 
    512514      END DO 
     515 
     516      ! Initialise arrays to zero because diatpr is called before they are first calculated 
     517      ! Note that this means diagnostics will not be exactly correct when model run is restarted. 
     518      htr_adv(:) = 0._wp ; str_adv(:) =  0._wp ;  htr_ldf(:) = 0._wp ; str_ldf(:) =  0._wp 
    513519 
    514520#if defined key_mpp_mpi  
Note: See TracChangeset for help on using the changeset viewer.