Changeset 9019 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

Timestamp:

2017-12-13T15:58:53+01:00 (6 years ago)

Author:

timgraham

Message:

Merge of dev_CNRS_2017 into branch

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90 (modified) (20 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

@@ -46 +46 @@
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)  
    USE prtctl         ! Print control
-   USE wrk_nemo       ! Memory Allocation
    USE lbclnk         ! ocean lateral boundary conditions
    USE timing         ! Timing
@@ -231 +230 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('eos-insitu')
+      IF( ln_timing )   CALL timing_start('eos-insitu')
       !
       SELECT CASE( neos )
@@ -298 +297 @@
       IF(ln_ctl)   CALL prt_ctl( tab3d_1=prd, clinfo1=' eos-insitu  : ', ovlap=1, kdim=jpk )
       !
-      IF( nn_timing == 1 )   CALL timing_stop('eos-insitu')
+      IF( ln_timing )   CALL timing_stop('eos-insitu')
       !
    END SUBROUTINE eos_insitu
@@ -329 +328 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('eos-pot')
+      IF( ln_timing )   CALL timing_start('eos-pot')
       !
       SELECT CASE ( neos )
@@ -465 +464 @@
       IF(ln_ctl)   CALL prt_ctl( tab3d_1=prd, clinfo1=' eos-pot: ', tab3d_2=prhop, clinfo2=' pot : ', ovlap=1, kdim=jpk )
       !
-      IF( nn_timing == 1 )   CALL timing_stop('eos-pot')
+      IF( ln_timing )   CALL timing_stop('eos-pot')
       !
    END SUBROUTINE eos_insitu_pot
@@ -491 +490 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('eos2d')
+      IF( ln_timing )   CALL timing_start('eos2d')
       !
       prd(:,:) = 0._wp
@@ -560 +559 @@
       IF(ln_ctl)   CALL prt_ctl( tab2d_1=prd, clinfo1=' eos2d: ' )
       !
-      IF( nn_timing == 1 )   CALL timing_stop('eos2d')
+      IF( ln_timing )   CALL timing_stop('eos2d')
       !
    END SUBROUTINE eos_insitu_2d
@@ -583 +582 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('rab_3d')
+      IF( ln_timing )   CALL timing_start('rab_3d')
       !
       SELECT CASE ( neos )
@@ -674 +673 @@
          &                       tab3d_2=pab(:,:,:,jp_sal), clinfo2=' rab_3d_s : ', ovlap=1, kdim=jpk )
       !
-      IF( nn_timing == 1 )   CALL timing_stop('rab_3d')
+      IF( ln_timing )   CALL timing_stop('rab_3d')
       !
    END SUBROUTINE rab_3d
@@ -696 +695 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 ) CALL timing_start('rab_2d')
+      IF( ln_timing )   CALL timing_start('rab_2d')
       !
       pab(:,:,:) = 0._wp
@@ -791 +790 @@
          &                       tab2d_2=pab(:,:,jp_sal), clinfo2=' rab_2d_s : ' )
       !
-      IF( nn_timing == 1 )   CALL timing_stop('rab_2d')
+      IF( ln_timing )   CALL timing_stop('rab_2d')
       !
    END SUBROUTINE rab_2d
@@ -812 +811 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 ) CALL timing_start('rab_2d')
+      IF( ln_timing )   CALL timing_start('rab_2d')
       !
       pab(:) = 0._wp
@@ -888 +887 @@
       END SELECT
       !
-      IF( nn_timing == 1 )   CALL timing_stop('rab_2d')
+      IF( ln_timing )   CALL timing_stop('rab_2d')
       !
    END SUBROUTINE rab_0d
@@ -915 +914 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 ) CALL timing_start('bn2')
+      IF( ln_timing )   CALL timing_start('bn2')
       !
       DO jk = 2, jpkm1           ! interior points only (2=< jk =< jpkm1 )
@@ -928 +927 @@
                pn2(ji,jj,jk) = grav * (  zaw * ( pts(ji,jj,jk-1,jp_tem) - pts(ji,jj,jk,jp_tem) )     &
                   &                    - zbw * ( pts(ji,jj,jk-1,jp_sal) - pts(ji,jj,jk,jp_sal) )  )  &
-                  &            / e3w_n(ji,jj,jk) * tmask(ji,jj,jk)
+                  &            / e3w_n(ji,jj,jk) * wmask(ji,jj,jk)
             END DO
          END DO
@@ -935 +934 @@
       IF(ln_ctl)   CALL prt_ctl( tab3d_1=pn2, clinfo1=' bn2  : ', ovlap=1, kdim=jpk )
       !
-      IF( nn_timing == 1 )   CALL timing_stop('bn2')
+      IF( ln_timing )   CALL timing_stop('bn2')
       !
    END SUBROUTINE bn2
@@ -963 +962 @@
       !!----------------------------------------------------------------------
       !
-      IF ( nn_timing == 1 )   CALL timing_start('eos_pt_from_ct')
+      IF( ln_timing )   CALL timing_start('eos_pt_from_ct')
       !
       zdeltaS = 5._wp
@@ -994 +993 @@
       END DO
       !
-      IF( nn_timing == 1 )   CALL timing_stop('eos_pt_from_ct')
+      IF( ln_timing )   CALL timing_stop('eos_pt_from_ct')
       !
    END FUNCTION eos_pt_from_ct
@@ -1128 +1127 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('eos_pen')
+      IF( ln_timing )   CALL timing_start('eos_pen')
       !
       SELECT CASE ( neos )
@@ -1222 +1221 @@
       END SELECT
       !
-      IF( nn_timing == 1 )   CALL timing_stop('eos_pen')
+      IF( ln_timing )   CALL timing_stop('eos_pen')
       !
    END SUBROUTINE eos_pen