New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 8444 – NEMO

Changeset 8444


Ignore:
Timestamp:
2017-08-18T16:35:46+02:00 (7 years ago)
Author:
anaguiar
Message:

Changes to avoid merge conflicts with package branch

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

Legend:

Unmodified
Added
Removed

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

    r8435 r8444  
    959959 
    960960      IF(lwp) WRITE(numout,*) 'dyn_bias( kt ) calculating rhd_pc, kt =', kt 
     961 
    961962      CALL eos( tsw, rhd_pc, rhop, fsdept_n(:,:,:) ) 
    962963       

  • branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90

    r6277 r8444  
    456456      END SELECT 
    457457      ! 
     458      CALL lbc_lnk( prd, 'T', 1.0_wp ) 
     459      ! 
    458460      IF(ln_ctl)   CALL prt_ctl( tab3d_1=prd, clinfo1=' eos-pot: ', tab3d_2=prhop, clinfo2=' pot : ', ovlap=1, kdim=jpk ) 
    459461      ! 

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

    r8435 r8444  
    3333   USE step_oce         ! time stepping definition modules 
    3434   USE iom 
     35 
    3536   IMPLICIT NONE 
    3637   PRIVATE 
    … …  
    273274                             CALL tra_nxt( kstp )                ! tracer fields at next time step 
    274275            IF( ln_sto_eos ) CALL sto_pts( tsn )                 ! Random T/S fluctuations 
    275             CALL eos    ( tsa, rhd, rhop, fsdept_n(:,:,:) )  ! Time-filtered in situ density for hpg computation 
    276             CALL lbc_lnk( rhd, 'T', 1.0_wp ) 
     276                             CALL eos    ( tsa, rhd, rhop, fsdept_n(:,:,:) )  ! Time-filtered in situ density for hpg computation 
    277277            IF( ln_zps .AND. .NOT. ln_isfcav)                                & 
    278278               &             CALL zps_hde    ( kstp, jpts, tsa, gtsu, gtsv,  &    ! Partial steps: before horizontal gradient 
    … …  
    286286         IF ( .NOT. lk_dynspg_ts ) THEN                      ! eos already called in time-split case 
    287287            IF( ln_sto_eos ) CALL sto_pts( tsn )             ! Random T/S fluctuations 
    288             CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) )  ! now in situ density for hpg computation 
    289             CALL lbc_lnk( rhd, 'T', 1.0_wp ) 
     288                             CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) )  ! now in situ density for hpg computation 
    290289         IF( ln_zps .AND. .NOT. ln_isfcav)                                   & 
    291290               &             CALL zps_hde    ( kstp, jpts, tsn, gtsu, gtsv,  &    ! Partial steps: before horizontal gradient 
Note: See TracChangeset for help on using the changeset viewer.