Changeset 3255 for branches/2011/dev_NEMO_MERGE_2011

Timestamp:

2012-01-09T16:54:41+01:00 (12 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:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (3 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -97 +97 @@
       !!----------------------------------------------------------------------
       INTEGER               ::   dia_ptr_alloc   ! return value
-      INTEGER, DIMENSION(5) ::   ierr
+      INTEGER, DIMENSION(6) ::   ierr
       !!----------------------------------------------------------------------
       ierr(:) = 0
@@ -122 +122 @@
          &     ndex_h(jpj),          ndex_h_atl_30(jpj), ndex_h_pac_30(jpj), &
          &     ndex_h_ind_30(jpj),   ndex_h_ipc_30(jpj), Stat=ierr(5) )
+         !
+     ALLOCATE( btm30(jpi,jpj) , STAT=ierr(6)  )
          !
       dia_ptr_alloc = MAXVAL( ierr )
@@ -511 +513 @@
          WHERE( sjk(:,:,jn) /= 0._wp )   r1_sjk(:,:,jn) = 1._wp / sjk(:,:,jn)
       END DO
+
+      ! Initialise arrays to zero because diatpr is called before they are first calculated
+      ! Note that this means diagnostics will not be exactly correct when model run is restarted.
+      htr_adv(:) = 0._wp ; str_adv(:) =  0._wp ;  htr_ldf(:) = 0._wp ; str_ldf(:) =  0._wp
 
 #if defined key_mpp_mpi