Changeset 7268

Timestamp:

2016-11-18T13:27:57+01:00 (8 years ago)

Author:

jamesharle

Message:

branch: NERC/dev_r6998_ORCHESTRA. merge with trunk@7161

Location:

branches/NERC/dev_r6998_ORCHESTRA/NEMOGCM

Files:

• NEMO/OPA_SRC/ZDF/zdfric.F90 (modified) (1 diff)
• NEMO/TOP_SRC/trcrst.F90 (modified) (1 diff)
• NEMO/TOP_SRC/trcsub.F90 (modified) (1 diff)
• TOOLS/MISCELLANEOUS/README_uspcfg (copied) (copied from trunk/NEMOGCM/TOOLS/MISCELLANEOUS/README_uspcfg)
• TOOLS/MISCELLANEOUS/make_usp_tar.sh (copied) (copied from trunk/NEMOGCM/TOOLS/MISCELLANEOUS/make_usp_tar.sh)

branches/NERC/dev_r6998_ORCHESTRA/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90

@@ -162 +162 @@
                   &                               + avmv(ji,jj,jk) + avmv(ji,jj-1,jk)  )   &
                   &          + avtb(jk) * tmask(ji,jj,jk)
-               !                                            ! Add the background coefficient on eddy viscosity
+            END DO
+         END DO
+         DO jj = 2, jpjm1                                   ! Add the background coefficient on eddy viscosity
+            DO ji = fs_2, fs_jpim1
                avmu(ji,jj,jk) = avmu(ji,jj,jk) + avmb(jk) * umask(ji,jj,jk)
                avmv(ji,jj,jk) = avmv(ji,jj,jk) + avmb(jk) * vmask(ji,jj,jk)

branches/NERC/dev_r6998_ORCHESTRA/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -295 +295 @@
          IF(lwp) WRITE(numout,9000) jn, TRIM( ctrcnm(jn) ), zmean, zmin, zmax, zdrift
       END DO
-      WRITE(numout,*) 
+      IF(lwp) WRITE(numout,*) 
 9000  FORMAT(' tracer nb :',i2,'    name :',a10,'    mean :',e18.10,'    min :',e18.10, &
       &      '    max :',e18.10,'    drift :',e18.10, ' %')

branches/NERC/dev_r6998_ORCHESTRA/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

@@ -16 +16 @@
    USE in_out_manager
    USE lbclnk
-#if defined key_zdftke
-   USE zdftke          ! twice TKE (en)
-#endif
-#if defined key_zdfgls
-   USE zdfgls, ONLY: en
-#endif
    USE trabbl
    USE zdf_oce