Changeset 3793

Timestamp:

2013-02-10T20:11:06+01:00 (11 years ago)

Author:

gm

Message:

dev_v3_4_STABLE_2012: #960 : correct bug in trdmld & trdmld_trc (time step control) + KPP/TRC compatibility (zdfkpp.F90)

Location:

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO

Files:

• OPA_SRC/TRD/trdmld.F90 (modified) (1 diff)
• OPA_SRC/ZDF/zdfkpp.F90 (modified) (3 diffs)
• TOP_SRC/TRP/trdmld_trc.F90 (modified) (2 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/TRD/trdmld.F90

@@ -761 +761 @@
       ! -------------------------------------------------
 
-      IF( ( lk_trdmld ) .AND. ( MOD( nitend, nn_trd ) /= 0 ) ) THEN
+      IF( ( lk_trdmld ) .AND. ( MOD( nitend-nit000+1, nn_trd ) /= 0 ) ) THEN
          WRITE(numout,cform_err)
          WRITE(numout,*) '                Your nitend parameter, nitend = ', nitend

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90

@@ -1304 +1304 @@
       !
       INTEGER  ::   ji, jj, jk, jn      ! Dummy loop indices
+      CHARACTER (len=35) :: charout
       REAL(wp) ::   ztra, zflx
       REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   ztrtrd
@@ -1333 +1334 @@
             END DO
          END DO
-         ! save the non-local tracer flux trends for diagnostic
-         IF( l_trdtrc )  ztrtrd(:,:,:)  = tra(:,:,:,jn) - ztrtrd(:,:,:)
-         CALL trd_tra( kt, 'TRC', jn, jptra_trd_zdf, ztrtrd(:,:,:,jn) )
+         !
+         IF( l_trdtrc ) THEN         ! save the non-local tracer flux trends for diagnostic
+            ztrtrd(:,:,:) = tra(:,:,:,jn) - ztrtrd(:,:,:)
+            CALL trd_tra( kt, 'TRC', jn, jptra_trd_zdf, ztrtrd(:,:,:) )
+         ENDIF
          !
       END DO
@@ -1341 +1344 @@
       IF( ln_ctl )   THEN
          WRITE(charout, FMT="(' kpp')")  ;  CALL prt_ctl_trc_info(charout)
-         CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=clname, clinfo2='trd' )
+         CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' )
       ENDIF
       !

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90

@@ -373 +373 @@
       !!       - See NEMO documentation (in preparation)
       !!----------------------------------------------------------------------
-      !
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       !
@@ -1174 +1173 @@
       ! -------------------------------------------------
 
-      IF( ( lk_trdmld_trc ) .AND. ( MOD( nitend, nn_trd_trc ) /= 0 ) ) THEN
+      IF( ( lk_trdmld_trc ) .AND. ( MOD( nitend-nittrc000+1, nn_trd_trc ) /= 0 ) ) THEN
          WRITE(numout,cform_err)
          WRITE(numout,*) '                Your nitend parameter, nitend = ', nitend