Changeset 3214 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM

Timestamp:

2011-12-12T14:33:31+01:00 (12 years ago)

Author:

cbricaud

Message:

undo last change (keep the second declaration of jpk ) and remove the first one in par_oce.F90

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diadimg.F90 (modified) (1 diff)
• TRA/traldf_iso_grif.F90 (modified) (1 diff)
• par_oce.F90 (modified) (2 diffs)
• step.F90 (modified) (1 diff)

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

@@ -41 +41 @@
       !!---------------------------------------------------------------------
       !
-      ALLOCATE( z42d(jpi,jpj), z4dep(jpk), STAT=dia_wri_dimg_alloc )
-      !
-      IF( lk_mpp                  )   CALL mpp_sum ( dia_wri_dimg_alloc )
-      IF( dia_wri_dimg_alloc /= 0 )   CALL ctl_warn('dia_wri_dimg_alloc: allocation of array failed.')
+      IF( .NOT. ALLOCATED( z42d ) )THEN
+
+         ALLOCATE( z42d(jpi,jpj), z4dep(jpk), STAT=dia_wri_dimg_alloc )
+
+         IF( lk_mpp                  )   CALL mpp_sum ( dia_wri_dimg_alloc )
+         IF( dia_wri_dimg_alloc /= 0 )   CALL ctl_warn('dia_wri_dimg_alloc: allocation of array failed.')
+
+      ELSE
+
+         dia_wri_dimg_alloc = 0
+
+      ENDIF
       !
   END FUNCTION dia_wri_dimg_alloc

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90

@@ -410 +410 @@
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE tra_ldf_iso_grif( kt, cdtype, pgu, pgv, ptb, pta, kjpt, pahtb0 )      ! Empty routine
+  SUBROUTINE tra_ldf_iso_grif( kt, kit000, cdtype, pgu, pgv,              &
+       &                                   ptb, pta, kjpt, pahtb0 )
       CHARACTER(len=3) ::   cdtype
+      INTEGER                              , INTENT(in   ) ::   kit000     ! first time step index
       REAL, DIMENSION(:,:,:) ::   pgu, pgv   ! tracer gradient at pstep levels
       REAL, DIMENSION(:,:,:,:) ::   ptb, pta

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/par_oce.F90

@@ -101 +101 @@
    INTEGER, PUBLIC, PARAMETER ::   jpiglo  = jpidta   !: 1st dimension of global domain --> i
    INTEGER, PUBLIC, PARAMETER ::   jpjglo  = jpjdta   !: 2nd    -                  -    --> j
-   INTEGER, PUBLIC            ::   jpk     = jpkdta   !: number of vertical levels
+
    ! zoom starting position 
    INTEGER, PUBLIC, PARAMETER ::   jpizoom =   1      !: left bottom (i,j) indices of the zoom
@@ -176 +176 @@
    INTEGER, PUBLIC  ::   jpi   ! = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   !: first  dimension
    INTEGER, PUBLIC  ::   jpj   ! = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj   !: second dimension
+   INTEGER, PUBLIC  ::   jpk   ! = jpkdta
    INTEGER, PUBLIC  ::   jpim1 ! = jpi-1                                            !: inner domain indices
    INTEGER, PUBLIC  ::   jpjm1 ! = jpj-1                                            !:   -     -      -

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -78 +78 @@
       INTEGER ::   indic    ! error indicator if < 0
       !! ---------------------------------------------------------------------
+      write(narea+200,*)"kstp = ",kstp
 
 #if defined key_agrif