Changeset 3792

Timestamp:

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

Author:

gm

Message:

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

Location:

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO

Files:

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

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

@@ -760 +760 @@
       ! -------------------------------------------------
 
-      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_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90

@@ -423 +423 @@
                zthermal = rn_alpha / ( rcp * zrhos + epsln )
                zhalin   = rn_beta * tsn(ji,jj,1,jp_sal) * rcs
+               zbeta    = rn_beta
             ENDIF
             ! Radiative surface buoyancy force
@@ -428 +429 @@
             ! Non radiative surface buoyancy force
             zBo   (ji,jj) = grav * zthermal * qns(ji,jj) -  grav * zhalin * ( emp(ji,jj)-rnf(ji,jj) )  &
-               &                                         -  grav * rbeta * rcs * sfx(ji,jj)
+               &                                         -  grav * zbeta * rcs * sfx(ji,jj)
             ! Surface Temperature flux for non-local term
             wt0(ji,jj) = - ( qsr(ji,jj) + qns(ji,jj) )* r1_rau0_rcp * tmask(ji,jj,1)
@@ -1306 +1307 @@
       !
       INTEGER  ::   ji, jj, jk, jn      ! Dummy loop indices
+      CHARACTER (len=35) :: charout
       REAL(wp) ::   ztra, zflx
       REAL(wp), DIMENSION(:,:,:), ALLOCATABLE ::   ztrtrd
@@ -1335 +1337 @@
             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
@@ -1343 +1347 @@
       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_MERGE_2012/NEMOGCM/NEMO/TOP_SRC/TRP/trdmld_trc.F90

@@ -17 +17 @@
    !!----------------------------------------------------------------------
    USE trc               ! tracer definitions (trn, trb, tra, etc.)
+   USE trc_oce, ONLY :   nn_dttrc  ! frequency of step on passive tracers
    USE dom_oce           ! domain definition
-   USE zdfmxl  , ONLY : nmln !: number of level in the mixed layer
-   USE zdf_oce , ONLY : avt  !: vert. diffusivity coef. at w-point for temp  
+   USE zdfmxl  , ONLY : nmln ! number of level in the mixed layer
+   USE zdf_oce , ONLY : avt  ! vert. diffusivity coef. at w-point for temp  
 # if defined key_zdfddm   
-   USE zdfddm  , ONLY : avs  !: salinity vertical diffusivity coeff. at w-point
+   USE zdfddm  , ONLY : avs  ! salinity vertical diffusivity coeff. at w-point
 # endif
    USE trcnam_trp        ! passive tracers transport namelist variables
@@ -1173 +1174 @@
       ! -------------------------------------------------
 
-      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