Changeset 11180 for NEMO/branches/UKMO/NEMO_4.0_surge/src/OCE/step.F90

Timestamp:

2019-06-25T18:50:27+02:00 (5 years ago)

Author:

clne

Message:

Initial commit of code for 2d (surge) work in NEMO4.
This is aiming to replicate the 3.6 version in branches/UKMO/dev_r5518_Surge_Modelling

File:

• NEMO/branches/UKMO/NEMO_4.0_surge/src/OCE/step.F90 (modified) (6 diffs)

NEMO/branches/UKMO/NEMO_4.0_surge/src/OCE/step.F90

@@ -125 +125 @@
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       !  THERMODYNAMICS
+      IF ( .NOT. ln_2d ) THEN 
                          CALL eos_rab( tsb, rab_b )       ! before local thermal/haline expension ratio at T-points
                          CALL eos_rab( tsn, rab_n )       ! now    local thermal/haline expension ratio at T-points
                          CALL bn2    ( tsb, rab_b, rn2b ) ! before Brunt-Vaisala frequency
                          CALL bn2    ( tsn, rab_n, rn2  ) ! now    Brunt-Vaisala frequency
-
+      ENDIF
+      
       !  VERTICAL PHYSICS
                          CALL zdf_phy( kstp )         ! vertical physics update (top/bot drag, avt, avs, avm + MLD)
@@ -163 +165 @@
                             CALL wzv           ( kstp )  ! now cross-level velocity 
       IF( ln_zad_Aimp )     CALL wAimp         ( kstp )  ! Adaptive-implicit vertical advection partitioning
-                            CALL eos    ( tsn, rhd, rhop, gdept_n(:,:,:) )  ! now in situ density for hpg computation
+      IF( .NOT. ln_2d )     CALL eos    ( tsn, rhd, rhop, gdept_n(:,:,:) )  ! now in situ density for hpg computation
                             
 !!jc: fs simplification
@@ -202 +204 @@
       ENDIF
       
-                         CALL dyn_zdf       ( kstp )  ! vertical diffusion
+      IF( .NOT. ln_2d )     CALL dyn_zdf       ( kstp )  ! vertical diffusion
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -232 +234 @@
       ! Active tracers                              
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+      IF (.NOT. ln_2d) THEN  ! No tracers in 2D mode
                          tsa(:,:,:,:) = 0._wp         ! set tracer trends to zero
 
@@ -257 +260 @@
                          CALL tra_zdf       ( kstp )  ! vertical mixing and after tracer fields
       IF( ln_zdfnpc  )   CALL tra_npc       ( kstp )  ! update after fields by non-penetrative convection
-
+      ENDIF ! not ln_2d 
+      
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Set boundary conditions and Swap
@@ -275 +279 @@
 !! 
 !!jc2: dynnxt must be the latest call. e3t_b are indeed updated in that routine
-                         CALL tra_nxt       ( kstp )  ! finalize (bcs) tracer fields at next time step and swap
+      IF (.NOT. ln_2d)   CALL tra_nxt       ( kstp )  ! finalize (bcs) tracer fields at next time step and swap
                          CALL dyn_nxt       ( kstp )  ! finalize (bcs) velocities at next time step and swap (always called after tra_nxt)
                          CALL ssh_swp       ( kstp )  ! swap of sea surface height