Changeset 3259 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

Timestamp:

2012-01-13T16:24:15+01:00 (12 years ago)

Author:

hliu

Message:

re-implement the semi-implicit bottom friction in DYNZDF_IMP.F90 to optimize the performance of this piece of code, Thanks for Italo's profiling results

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90 (modified) (4 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

@@ -123 +123 @@
             &                       tab2d_2=bfrva, clinfo2=       ' v: ', mask2=vmask,ovlap=1 )
       ENDIF
+
       !
       IF( nn_timing == 1 )  CALL timing_stop('zdf_bfr')
@@ -170 +171 @@
             WRITE(numout,*) 'Implicit bottom friction can only be used when ln_zdfexp=.false.'
             WRITE(numout,*) '         but you set: ln_bfrimp=.true. and ln_zdfexp=.true.!!!!'
-            WRITE(ctmp1,*)  '         bad ln_bfrimp value = .true.' 
+            WRITE(ctmp1,*)  '         set either "ln_zdfexp = .false" or "ln_bfrimp = .false."
             CALL ctl_stop( ctmp1 )
          END IF
@@ -272 +273 @@
          CALL mpp_max( zmaxbfr )
       ENDIF
+      IF( .NOT.ln_bfrimp) THEN
       IF( lwp .AND. ictu + ictv > 0 ) THEN
          WRITE(numout,*) ' Bottom friction stability check failed at ', ictu, ' U-points '
@@ -278 +280 @@
          WRITE(numout,*) ' Bottom friction coefficient will be reduced where necessary'
       ENDIF
+      ENDIF
       !
       IF( nn_timing == 1 )  CALL timing_stop('zdf_bfr_init')