Changeset 3044 for branches

Timestamp:

2011-11-04T16:49:50+01:00 (12 years ago)

Author:

acc

Message:

Branch dev_NOC_2011_MERGE. #874. Step 9: minor corrections required for full SETTE compliance (includes small bug fix to traldf_lap.F90 which was uncovered during investigations)

Location:

branches/2011/dev_NOC_2011_MERGE/NEMOGCM

Files:

• CONFIG/ORCA2_LIM/EXP00/namelist (modified) (1 diff)
• NEMO/OPA_SRC/TRA/traldf_lap.F90 (modified) (1 diff)

branches/2011/dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist

@@ -870 +870 @@
 !-----------------------------------------------------------------------
    ! Suggested lengthscale values are those of Eby & Holloway (1994) for a coarse model
-   ln_neptsimp       = .true.   ! yes/no use simplified neptune
+   ln_neptsimp       = .false.  ! yes/no use simplified neptune
 
    ln_smooth_neptvel = .false.  ! yes/no smooth zunep, zvnep

branches/2011/dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90

@@ -82 +82 @@
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~ '
          !
-         ALLOCATE( e1ur(jpi,jpj), e2vr(jpi,jpj), STAT=ierr )
-         IF( lk_mpp    )   CALL mpp_sum( ierr )
-         IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'tra_ldf_lap : unable to allocate arrays' )
-         !
-         e1ur(:,:) = e2u(:,:) / e1u(:,:)
-         e2vr(:,:) = e1v(:,:) / e2v(:,:)
+         IF( .NOT. ALLOCATED( e1ur ) ) THEN
+            ! This routine may be called for both active and passive tracers. 
+            ! Allocate and set saved arrays on first call only.
+            ALLOCATE( e1ur(jpi,jpj), e2vr(jpi,jpj), STAT=ierr )
+            IF( lk_mpp    )   CALL mpp_sum( ierr )
+            IF( ierr /= 0 )   CALL ctl_stop( 'STOP', 'tra_ldf_lap : unable to allocate arrays' )
+            !
+            e1ur(:,:) = e2u(:,:) / e1u(:,:)
+            e2vr(:,:) = e1v(:,:) / e2v(:,:)
+         ENDIF
       ENDIF