Changeset 8445

Timestamp:

2017-08-18T17:01:53+02:00 (7 years ago)

Author:

anaguiar

Message:

Further changes to solve conflict merges with package branch

Location:

branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC

Files:

• ASM/bias.F90 (modified) (1 diff)
• step.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/ASM/bias.F90

@@ -960 +960 @@
       IF(lwp) WRITE(numout,*) 'dyn_bias( kt ) calculating rhd_pc, kt =', kt
 
-      CALL eos( tsw, rhd_pc, rhop, fsdept_n(:,:,:) )
+      CALL eos( tsw, rhd_pc, rhop , fsdept_n(:,:,:))
       
       CALL lbc_lnk( rhd_pc, 'T', 1.0_wp )

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

@@ -283 +283 @@
                &                                    gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi    ) ! of t, s, rd at the last ocean level
             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
-            IF( ln_sto_eos ) CALL sto_pts( tsn )             ! Random T/S fluctuations
+      ELSE                                                  ! centered hpg  (eos then time stepping)
+         IF ( .NOT. lk_dynspg_ts ) THEN                     ! eos already called in time-split case
+            IF( ln_sto_eos ) CALL sto_pts( tsn )    ! Random T/S fluctuations
                              CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) )  ! now in situ density for hpg computation
          IF( ln_zps .AND. .NOT. ln_isfcav)                                   &