Changeset 14200 for NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/DYN/sshwzv.F90

Timestamp:

2020-12-17T15:36:44+01:00 (4 years ago)

Author:

mcastril

Message:

Merging r14117 through r14199 into dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final

File:

• NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/DYN/sshwzv.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/DYN/sshwzv.F90

@@ -18 +18 @@
    !!   ssh_atf       : time filter the ssh arrays
    !!   wzv           : compute now vertical velocity
-   !!   ssh_init_rst  : ssh set from restart or domcfg.nc file or usr_def_istat_ssh
    !!----------------------------------------------------------------------
    USE oce            ! ocean dynamics and tracers variables
@@ -29 +28 @@
    USE bdy_oce , ONLY : ln_bdy, bdytmask   ! Open BounDarY
    USE bdydyn2d       ! bdy_ssh routine
+   USE wet_dry        ! Wetting/Drying flux limiting
 #if defined key_agrif
    USE agrif_oce
@@ -41 +41 @@
    USE lib_mpp        ! MPP library
    USE timing         ! Timing
-   USE wet_dry        ! Wetting/Drying flux limiting
-   USE usrdef_istate, ONLY : usr_def_istate_ssh   ! user defined ssh initial state 
    
    IMPLICIT NONE
@@ -51 +49 @@
    PUBLIC   wAimp          ! called by step.F90
    PUBLIC   ssh_atf        ! called by step.F90
-   PUBLIC   ssh_init_rst   ! called by domain.F90
 
    !! * Substitutions
@@ -436 +433 @@
       !
    END SUBROUTINE wAimp
-
-
-   SUBROUTINE ssh_init_rst( Kbb, Kmm, Kaa )
-      !!---------------------------------------------------------------------
-      !!                   ***  ROUTINE ssh_init_rst  ***
-      !!
-      !! ** Purpose :   ssh initialization of the sea surface height (ssh)
-      !!
-      !! ** Method  :   set ssh from restart or read configuration, or user_def
-      !!              * ln_rstart = T
-      !!                   USE of IOM library to read ssh in the restart file
-      !!                   Leap-Frog: Kbb and Kmm are read except for l_1st_euler=T
-      !!
-      !!              * otherwise 
-      !!                   call user defined ssh or
-      !!                   set to -ssh_ref in wet and drying case with domcfg.nc
-      !!
-      !!              NB: ssh_b/n are written by restart.F90
-      !!----------------------------------------------------------------------
-      INTEGER, INTENT(in) ::   Kbb, Kmm, Kaa   ! ocean time level indices
-      !
-      INTEGER ::   ji, jj, jk
-      !!----------------------------------------------------------------------
-      !
-      IF(lwp) THEN
-         WRITE(numout,*)
-         WRITE(numout,*) 'ssh_init_rst : ssh initialization'
-         WRITE(numout,*) '~~~~~~~~~~~~ '
-      ENDIF
-      !
-      !                            !=============================!
-      IF( ln_rstart ) THEN         !==  Read the restart file  ==!
-         !                         !=============================!
-         !
-         !                                     !*  Read ssh at Kmm
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*)    '      Kmm sea surface height read in the restart file'
-         CALL iom_get( numror, jpdom_auto, 'sshn'   , ssh(:,:,Kmm) )
-         !
-         IF( l_1st_euler ) THEN                !* Euler at first time-step
-            IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) '      Euler first time step : ssh(Kbb) = ssh(Kmm)'
-            ssh(:,:,Kbb) = ssh(:,:,Kmm)
-            !
-         ELSE                                  !* read ssh at Kbb
-            IF(lwp) WRITE(numout,*)
-            IF(lwp) WRITE(numout,*) '      Kbb sea surface height read in the restart file'
-            CALL iom_get( numror, jpdom_auto, 'sshb', ssh(:,:,Kbb) )
-         ENDIF
-         !                         !============================!
-      ELSE                         !==  Initialize at "rest"  ==!
-         !                         !============================!
-         !
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*)    '      initialization at rest'
-         !
-         IF( ll_wd ) THEN                      !* wet and dry 
-            !
-            IF( ln_read_cfg  ) THEN                 ! read configuration : ssh_ref is read in domain_cfg file
-!!st  why ssh is not masked : i.e. ssh(:,:,Kmm) = -ssh_ref*ssmask(:,:),
-!!st  since at the 1st time step lbclnk will be applied on ssh at Kaa but not initially at Kbb and Kmm
-               ssh(:,:,Kbb) = -ssh_ref
-               !
-               DO_2D( 1, 1, 1, 1 )
-                  IF( ht_0(ji,jj)-ssh_ref <  rn_wdmin1 ) THEN   ! if total depth is less than min depth
-                     ssh(ji,jj,Kbb) = rn_wdmin1 - ht_0(ji,jj)
-                  ENDIF
-               END_2D
-            ELSE                                    ! user define configuration case  
-               CALL usr_def_istate_ssh( tmask, ssh(:,:,Kbb) )
-            ENDIF
-            !
-         ELSE                                  !* user defined configuration
-            CALL usr_def_istate_ssh( tmask, ssh(:,:,Kbb) )
-            !
-         ENDIF
-         !
-         ssh(:,:,Kmm) = ssh(:,:,Kbb)           !* set now values from to before ones
-         ssh(:,:,Kaa) = 0._wp 
-      ENDIF
-      !
-   END SUBROUTINE ssh_init_rst
       
    !!======================================================================