Changeset 8445


Ignore:
Timestamp:
2017-08-18T17:01:53+02:00 (3 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:
2 edited

Legend:

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

    r8444 r8445  
    960960      IF(lwp) WRITE(numout,*) 'dyn_bias( kt ) calculating rhd_pc, kt =', kt 
    961961 
    962       CALL eos( tsw, rhd_pc, rhop, fsdept_n(:,:,:) ) 
     962      CALL eos( tsw, rhd_pc, rhop , fsdept_n(:,:,:)) 
    963963       
    964964      CALL lbc_lnk( rhd_pc, 'T', 1.0_wp ) 
  • branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/step.F90

    r8444 r8445  
    283283               &                                    gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi    ) ! of t, s, rd at the last ocean level 
    284284            IF( ln_bias )    CALL dyn_bias( kstp ) 
    285       ELSE                                                   ! centered hpg  (eos then time stepping) 
    286          IF ( .NOT. lk_dynspg_ts ) THEN                      ! eos already called in time-split case 
    287             IF( ln_sto_eos ) CALL sto_pts( tsn )             ! Random T/S fluctuations 
     285      ELSE                                                  ! centered hpg  (eos then time stepping) 
     286         IF ( .NOT. lk_dynspg_ts ) THEN                     ! eos already called in time-split case 
     287            IF( ln_sto_eos ) CALL sto_pts( tsn )    ! Random T/S fluctuations 
    288288                             CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) )  ! now in situ density for hpg computation 
    289289         IF( ln_zps .AND. .NOT. ln_isfcav)                                   & 
Note: See TracChangeset for help on using the changeset viewer.