Changeset 14200 for NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/DOM/istate.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/DOM/istate.F90 (modified) (4 diffs)

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/DOM/istate.F90

@@ -90 +90 @@
 
 #if defined key_agrif
-      IF ( (.NOT.Agrif_root()).AND.ln_init_chfrpar ) THEN
+      IF ( .NOT.Agrif_root() .AND. ln_init_chfrpar ) THEN
          numror = 0                           ! define numror = 0 -> no restart file to read
          ln_1st_euler = .true.                ! Set time-step indicator at nit000 (euler forward)
@@ -97 +97 @@
          !
          ts (:,:,:,:,Kmm) = ts (:,:,:,:,Kbb)
-!!st
-!!st need for a recent agrif version to be displaced toward ssh_init_rst with agrif_istate_ssh
-         ssh(:,:,    Kmm) = ssh(:,:    ,Kbb)
-!!st end
          uu (:,:,:  ,Kmm) = uu (:,:,:  ,Kbb)
          vv (:,:,:  ,Kmm) = vv (:,:,:  ,Kbb)
@@ -116 +112 @@
             CALL day_init                        ! model calendar (using both namelist and restart infos)
             !                                    ! Initialization of ocean to zero
+            !
             IF( ln_tsd_init ) THEN               
                CALL dta_tsd( nit000, ts(:,:,:,:,Kbb) )       ! read 3D T and S data at nit000
                !
-               ssh(:,:,Kbb)   = 0._wp               ! set the ocean at rest
-               uu  (:,:,:,Kbb) = 0._wp
+               uu  (:,:,:,Kbb) = 0._wp               ! set the ocean at rest
                vv  (:,:,:,Kbb) = 0._wp  
-               !
-               IF( ll_wd ) THEN
-                  ssh(:,:,Kbb) =  -ssh_ref  ! Added in 30 here for bathy that adds 30 as Iterative test CEOD 
-                  !
-                  ! Apply minimum wetdepth criterion
-                  !
-                  DO_2D( 1, 1, 1, 1 )
-                     IF( ht_0(ji,jj) + ssh(ji,jj,Kbb)  < rn_wdmin1 ) THEN
-                        ssh(ji,jj,Kbb) = tmask(ji,jj,1)*( rn_wdmin1 - (ht_0(ji,jj)) )
-                     ENDIF
-                  END_2D
-               ENDIF 
                !
             ELSE                                 ! user defined initial T and S
@@ -142 +126 @@
             ENDIF
             ts  (:,:,:,:,Kmm) = ts (:,:,:,:,Kbb)       ! set now values from to before ones
-            ssh (:,:,Kmm)     = ssh(:,:,Kbb)   
-            uu   (:,:,:,Kmm)   = uu  (:,:,:,Kbb)
-            vv   (:,:,:,Kmm)   = vv  (:,:,:,Kbb)
+            uu    (:,:,:,Kmm) = uu   (:,:,:,Kbb)
+            vv    (:,:,:,Kmm) = vv   (:,:,:,Kbb)
 
          !