Merge branch 'cherry-pick-257413aa' into 'branch_4.2'

Merge branch '51-missing-boundaries-conditions-in-nemo-top-1d' into 'branch_4.2'

See merge request nemo/nemo!103

src/TOP/TRP/trctrp.F90

@@ -95,6 +95,9 @@ CONTAINS
          !
       ELSE                                               ! 1D vertical configuration
                                 CALL trc_sbc( kt,      Kmm,       tr, Krhs )  ! surface boundary condition
+         IF( ln_trcbc .AND. lltrcbc .AND. kt /= nit000 )  &
+                                CALL trc_bc     ( kt,      Kmm, tr, Krhs )      ! tracers: surface and lateral Boundary Conditions 
+         IF( ln_trcais )        CALL trc_ais    ( kt,      Kmm, tr, Krhs )      ! tracers from Antarctic Ice Sheet (icb, isf)               
          IF( ln_trcdmp )        CALL trc_dmp( kt, Kbb, Kmm,       tr, Krhs )  ! internal damping trends
                                 CALL trc_zdf( kt, Kbb, Kmm, Krhs, tr, Kaa  )  ! vert. mixing & after tracer	==> after
                                 CALL trc_atf( kt, Kbb, Kmm, Kaa , tr )        ! time filtering of "now" tracer fields