Changeset 13874 for NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/ISOMIP+

Timestamp:

2020-11-25T14:49:40+01:00 (4 years ago)

Author:

techene

Message:

#2574 ssh set up at initialization or restart separated from u,v,ts : removed from istate_init added in dom_init

File:

• NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/ISOMIP+/MY_SRC/istate.F90 (modified) (1 diff)

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/ISOMIP+/MY_SRC/istate.F90

@@ -99 +99 @@
             CALL dta_tsd( nit000, 'ini', ts(:,:,:,:,Kbb) )       ! read 3D T and S data at nit000
             !
-            ssh(:,:,Kbb)   = 0._wp               ! set the ocean at rest
-            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 
+!!st            ssh(:,:,Kbb)   = 0._wp               ! set the ocean at rest
+!!st            IF( ll_wd ) THEN
+!!st               ssh(:,:,Kbb) =  -ssh_ref  ! Added in 30 here for bathy that adds 30 as Iterative test CEOD 
+!!st               !
+!!st               ! Apply minimum wetdepth criterion
+!!st               !
+!!st               DO_2D( 1, 1, 1, 1 )
+!!st                  IF( ht_0(ji,jj) + ssh(ji,jj,Kbb)  < rn_wdmin1 ) THEN
+!!st                     ssh(ji,jj,Kbb) = tmask(ji,jj,1)*( rn_wdmin1 - (ht_0(ji,jj)) )
+!!st                  ENDIF
+!!st               END_2D
+!!st            ENDIF 
             uu  (:,:,:,Kbb) = 0._wp
             vv  (:,:,:,Kbb) = 0._wp  
             !
          ELSE                                 ! user defined initial T and S
-            CALL usr_def_istate( gdept(:,:,:,Kbb), tmask, ts(:,:,:,:,Kbb), uu(:,:,:,Kbb), vv(:,:,:,Kbb), ssh(:,:,Kbb)  )         
+            CALL usr_def_istate( gdept(:,:,:,Kbb), tmask, ts(:,:,:,:,Kbb), uu(:,:,:,Kbb), vv(:,:,:,Kbb) )
+            CALL usr_def_istate_ssh(tmask, ssh(:,:,Kbb) )         
          ENDIF
          ts  (:,:,:,:,Kmm) = ts (:,:,:,:,Kbb)       ! set now values from to before ones
-         ssh (:,:,Kmm)     = ssh(:,:,Kbb)   
+!!st         ssh (:,:,Kmm)     = ssh(:,:,Kbb)   
          uu   (:,:,:,Kmm)   = uu  (:,:,:,Kbb)
          vv   (:,:,:,Kmm)   = vv  (:,:,:,Kbb)