Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90

@@ -64 +64 @@
       ! Update data, open boundaries, surface boundary condition (including sea-ice)
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-      IF( lk_dtatem  )   CALL dta_tem( kstp )         ! update 3D temperature data
-      IF( lk_dtasal  )   CALL dta_sal( kstp )         ! update 3D salinity data
                          CALL sbc    ( kstp )         ! Sea Boundary Condition (including sea-ice)
 
@@ -127 +125 @@
       IF( ln_zdfnpc      )   CALL tra_npc    ( kstp )        ! applied non penetrative convective adjustment on (t,s)
                              CALL eos( tsb, rhd, rhop )      ! now (swap=before) in situ density for dynhpg module
-                             CALL tra_unswap                 ! udate T & S 3D arrays  (to be suppressed)
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>