Changeset 7665


Ignore:
Timestamp:
2017-02-10T12:24:45+01:00 (4 years ago)
Author:
isabella
Message:

making changes to be consistent

Location:
branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/ASM/bias.F90

    r7662 r7665  
    956956            tsw(:,:,:,jp_sal) = tsa(:,:,:,jp_sal) - sbias_p(:,:,:) - sbias_i(:,:,:) 
    957957            IF ( ln_incpc_only ) THEN 
     958               IF(lwp) WRITE(numout,*) 'SUM(tbias_i) is', SUM(tbias_i), 'before to be added to tsw' 
    958959               IF(lwp) WRITE(numout,*) 'ln_incpc_only =', ln_incpc_only, 'tsw updated with IPC only and ln_dynhpg_imp = ',ln_dynhpg_imp 
    959960               tsw(:,:,:,jp_tem) = tsa(:,:,:,jp_tem) - tbias_i(:,:,:) 
     
    979980 
    980981      IF(lwp) WRITE(numout,*) 'dyn_bias( kt ) calculating rhd_pc, kt =', kt 
    981       CALL eos( tsw, rhd_pc, rhop ) 
     982      !! GO5: CALL eos( tsw, rhd_pc, rhop ) 
     983              CALL eos( tsw, rhd_pc, rhop, fsdept_n(:,:,:) ) 
    982984       
    983985      ! is this needed? 
  • branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/step.F90

    r7284 r7665  
    274274            IF( ln_sto_eos ) CALL sto_pts( tsn )                 ! Random T/S fluctuations 
    275275                             CALL eos    ( tsa, rhd, rhop, fsdept_n(:,:,:) )  ! Time-filtered in situ density for hpg computation 
     276                             CALL lbc_lnk( rhd, 'T', 1.0_wp ) 
    276277            IF( ln_zps .AND. .NOT. ln_isfcav)                                & 
    277278               &             CALL zps_hde    ( kstp, jpts, tsa, gtsu, gtsv,  &    ! Partial steps: before horizontal gradient 
     
    286287            IF( ln_sto_eos ) CALL sto_pts( tsn )    ! Random T/S fluctuations 
    287288                             CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) )  ! now in situ density for hpg computation 
     289                             CALL lbc_lnk( rhd, 'T', 1.0_wp ) 
    288290         IF( ln_zps .AND. .NOT. ln_isfcav)                                   & 
    289291               &             CALL zps_hde    ( kstp, jpts, tsn, gtsu, gtsv,  &    ! Partial steps: before horizontal gradient 
Note: See TracChangeset for help on using the changeset viewer.