Changeset 6328 for branches/UKMO/dev_r5518_pcbias/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2016-02-18T17:46:36+01:00 (8 years ago)

Author:

jenniewaters

Message:

Make reviewer suggested changes. Update code to allow key_bias to be removed. Fixe a few minor bugs.

File:

• branches/UKMO/dev_r5518_pcbias/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (5 diffs)

branches/UKMO/dev_r5518_pcbias/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -97 +97 @@
       IF( ln_crs     )       CALL iom_setkt( kstp - nit000 + 1, TRIM(cxios_context)//"_crs" )   ! tell iom we are at time step kstp
 
-      IF( lk_bias ) THEN
-         IF( ln_bias )          CALL bias_opn( kstp )
-      ENDIF
+      IF( ln_bias )          CALL bias_opn( kstp )
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -259 +257 @@
       IF( lk_trabbl      )   CALL tra_bbl    ( kstp )       ! advective (and/or diffusive) bottom boundary layer scheme
       IF( ln_tradmp      )   CALL tra_dmp    ( kstp )       ! internal damping trends
-      IF( lk_bias  ) THEN
-         IF( ln_bias     )   CALL tra_bias   ( kstp )
-      ENDIF
+      IF( ln_bias        )   CALL tra_bias   ( kstp )
       IF( lk_bdy         )   CALL bdy_tra_dmp( kstp )       ! bdy damping trends
                              CALL tra_adv    ( kstp )       ! horizontal & vertical advection
@@ -286 +282 @@
                &                                           rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv ,   &
                &                                    gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi    ) ! of t, s, rd at the last ocean level
-            IF( lk_bias  ) THEN
-               IF( ln_bias ) CALL dyn_bias( kstp )
-            ENDIF
+            IF( ln_bias )    CALL dyn_bias( kstp )
       ELSE                                                  ! centered hpg  (eos then time stepping)
          IF ( .NOT. lk_dynspg_ts ) THEN                     ! eos already called in time-split case
@@ -303 +297 @@
          IF( ln_zdfnpc   )   CALL tra_npc( kstp )                ! update after fields by non-penetrative convection
                              CALL tra_nxt( kstp )                ! tracer fields at next time step
-         IF( lk_bias  ) THEN
-            IF( ln_bias ) CALL dyn_bias( kstp )
-         ENDIF
+         IF( ln_bias )       CALL dyn_bias( kstp )
       ENDIF
 
@@ -366 +358 @@
       ENDIF
       IF( lrst_oce         )   CALL rst_write    ( kstp )   ! write output ocean restart file
-      IF( lk_bias  ) THEN
-         IF( lrst_bias )       CALL bias_wrt     ( kstp )
-      ENDIF
+      IF( lrst_bias )          CALL bias_wrt     ( kstp )
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>