Changeset 7665 for branches

Timestamp:

2017-02-10T12:24:45+01:00 (7 years ago)

Author:

isabella

Message:

making changes to be consistent

Location:

branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC

Files:

• ASM/bias.F90 (modified) (2 diffs)
• step.F90 (modified) (2 diffs)

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

@@ -956 +956 @@
             tsw(:,:,:,jp_sal) = tsa(:,:,:,jp_sal) - sbias_p(:,:,:) - sbias_i(:,:,:)
             IF ( ln_incpc_only ) THEN
+               IF(lwp) WRITE(numout,*) 'SUM(tbias_i) is', SUM(tbias_i), 'before to be added to tsw'
                IF(lwp) WRITE(numout,*) 'ln_incpc_only =', ln_incpc_only, 'tsw updated with IPC only and ln_dynhpg_imp = ',ln_dynhpg_imp
                tsw(:,:,:,jp_tem) = tsa(:,:,:,jp_tem) - tbias_i(:,:,:)
@@ -979 +980 @@
 
       IF(lwp) WRITE(numout,*) 'dyn_bias( kt ) calculating rhd_pc, kt =', kt
-      CALL eos( tsw, rhd_pc, rhop )
+      !! GO5: CALL eos( tsw, rhd_pc, rhop )
+              CALL eos( tsw, rhd_pc, rhop, fsdept_n(:,:,:) )
       
       ! is this needed?

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

@@ -274 +274 @@
             IF( ln_sto_eos ) CALL sto_pts( tsn )                 ! Random T/S fluctuations
                              CALL eos    ( tsa, rhd, rhop, fsdept_n(:,:,:) )  ! Time-filtered in situ density for hpg computation
+                             CALL lbc_lnk( rhd, 'T', 1.0_wp )
             IF( ln_zps .AND. .NOT. ln_isfcav)                                &
                &             CALL zps_hde    ( kstp, jpts, tsa, gtsu, gtsv,  &    ! Partial steps: before horizontal gradient
@@ -286 +287 @@
             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
+                             CALL lbc_lnk( rhd, 'T', 1.0_wp )
          IF( ln_zps .AND. .NOT. ln_isfcav)                                   &
                &             CALL zps_hde    ( kstp, jpts, tsn, gtsu, gtsv,  &    ! Partial steps: before horizontal gradient