Changeset 5927 for branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2015-11-26T12:23:11+01:00 (8 years ago)

Author:

jchanut

Message:

FS simplification: Insert changes related to #1638, #1625 + C1D compatibility

File:

• branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (1 diff)

branches/2015/dev_r5847_MERCATOR9_solveur_simplification/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -191 +191 @@
 !!gm
                          CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation
+
+!!jc: fs simplification
+!!jc: lines below useless if lk_vvl=T. Keep it here (which maintains a bug if lk_vvl=F and ln_zps=T, cf ticket #1636) 
+!!                                     but ensures reproductible results
+!!                                     with previous versions using split-explicit free surface          
+            IF( ln_zps .AND. .NOT. ln_isfcav)   &                           ! Partial steps: bottom before horizontal gradient
+               &            CALL zps_hde    ( kstp, jpts, tsn, gtsu, gtsv,  &  ! of t, s, rd at the last ocean level
+               &                                          rhd, gru , grv    )
+            IF( ln_zps .AND.       ln_isfcav)   &                           ! Partial steps: top & bottom before horizontal gradient
+               &            CALL zps_hde_isf( kstp, jpts, tsn, gtsu, gtsv, gtui, gtvi,   & 
+               &                                          rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv ,   &
+               &                                               grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi    )
+!!jc: fs simplification
                             
                          ua(:,:,:) = 0._wp            ! set dynamics trends to zero