Changeset 7403 for branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90

Timestamp:

2016-11-30T17:56:53+01:00 (8 years ago)

Author:

timgraham

Message:

Merge dev_INGV_METO_merge_2016 into branch

File:

• branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90 (modified) (2 diffs)

branches/2016/dev_merge_2016/NEMOGCM/NEMO/TOP_SRC/TRP/trcsbc.F90

@@ -84 +84 @@
       END SELECT
 
-      IF( ln_top_euler) THEN
-         r2dt =  rdttrc              ! = rdttrc (use Euler time stepping)
-      ELSE
-         IF( neuler == 0 .AND. kt == nittrc000 ) THEN     ! at nittrc000
-            r2dt = rdttrc            ! = rdttrc (restarting with Euler time stepping)
-         ELSEIF( kt <= nittrc000 + nn_dttrc ) THEN          ! at nittrc000 or nittrc000+1
-            r2dt = 2. * rdttrc       ! = 2 rdttrc (leapfrog)
-         ENDIF
-      ENDIF
-
-
       IF( kt == nittrc000 ) THEN
          IF(lwp) WRITE(numout,*)
@@ -160 +149 @@
                   zdtra = r1_rau0 * ( ztfx + zsfx(ji,jj) * trn(ji,jj,1,jn) ) 
                   IF ( zdtra < 0. ) THEN
-                     zratio = -zdtra * zse3t * r2dt / ( trn(ji,jj,1,jn) + zrtrn )
+                     zratio = -zdtra * zse3t * r2dttrc / ( trn(ji,jj,1,jn) + zrtrn )
                      zdtra = MIN(1.0, zratio) * zdtra ! avoid negative concentrations to arise
                   ENDIF