Changeset 5782 for branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/TOP_SRC

Timestamp:

2015-10-08T15:51:36+02:00 (9 years ago)

Author:

cetlod

Message:

Final step of improvements/simplifications of ADV & LDF momentum trends. The branch is now phased with the trunk at revision 5721 and is ready to be used

Location:

branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/TOP_SRC/TRP

Files:

• trcdmp.F90 (modified) (2 diffs)
• trctrp.F90 (modified) (1 diff)

branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90

@@ -208 +208 @@
       ENDIF
       !
-      IF( lzoom )   nn_zdmp_tr = 0           ! restoring to climatology at closed north or south boundaries
+      IF( lzoom .AND. .NOT.lk_c1d )   nn_zdmp_tr = 0           ! restoring to climatology at closed north or south boundaries
       SELECT CASE ( nn_zdmp_tr )
       CASE ( 0 )   ;   IF(lwp) WRITE(numout,*) '   tracer damping throughout the water column'
@@ -218 +218 @@
       END SELECT
 
-      IF( .NOT. ln_tradmp )   &
-         &   CALL ctl_stop( 'passive trace damping need key_tradmp to compute damping coef.' )
-      !
-      !                          ! Read damping coefficients from file
-      !Read in mask from file
-      CALL iom_open ( cn_resto_tr, imask)
-      CALL iom_get  ( imask, jpdom_autoglo, 'resto', restotr)
-      CALL iom_close( imask )
-      !
+      IF( .NOT.lk_c1d ) THEN
+         IF( .NOT. ln_tradmp )   &
+            &   CALL ctl_stop( 'passive trace damping need ln_tradmp to compute damping coef.' )
+         !
+         !                          ! Read damping coefficients from file
+         !Read in mask from file
+         CALL iom_open ( cn_resto_tr, imask)
+         CALL iom_get  ( imask, jpdom_autoglo, 'resto', restotr)
+         CALL iom_close( imask )
+         !
+      ENDIF
       IF( nn_timing == 1 )  CALL timing_stop('trc_dmp_init')
       !

branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/TOP_SRC/TRP/trctrp.F90

@@ -86 +86 @@
       ELSE                                               ! 1D vertical configuration
                                 CALL trc_sbc( kt )            ! surface boundary condition
+         IF( ln_trcdmp )        CALL trc_dmp( kt )            ! internal damping trends
                                 CALL trc_zdf( kt )            ! vertical mixing and after tracer fields
                                 CALL trc_nxt( kt )            ! tracer fields at next time step