Changeset 15008 for NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/istate.F90

Timestamp:

2021-06-17T12:11:24+02:00 (3 years ago)

Author:

gsamson

Message:

add dyn_dmp to mlf step; update dta_uvd interface; adapt istate accordingly & cleaning (#2680)

File:

• NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/istate.F90 (modified) (4 diffs)

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/istate.F90

@@ -29 +29 @@
    USE wet_dry         ! wetting and drying (needed for wad_istate)
    USE usrdef_istate   ! User defined initial state
-   USE c1d
    !
    USE in_out_manager  ! I/O manager
@@ -77 +76 @@
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
 
-       CALL dta_tsd_init        ! Initialisation of T & S input data
-
-!      IF( lk_c1d )   CALL dta_uvd_init        ! Initialization of U & V input data
+      CALL dta_tsd_init                 ! Initialisation of T & S input data
+      IF( ln_c1d) CALL dta_uvd_init     ! Initialisation of U & V input data (c1d only)
 
       rhd  (:,:,:      ) = 0._wp   ;   rhop (:,:,:  ) = 0._wp      ! set one for all to 0 at level jpk
@@ -115 +113 @@
             !
             IF( ln_tsd_init ) THEN               
-               CALL dta_tsd( nit000, ts(:,:,:,:,Kbb) )       ! read 3D T and S data at nit000
-               !
+               CALL dta_tsd( nit000, ts(:,:,:,:,Kbb) )                     ! read 3D T and S data at nit000
+            ENDIF
+            !
+            IF( ln_uvd_init .AND. ln_c1d ) THEN               
+               CALL dta_uvd( nit000, Kbb, uu(:,:,:,Kbb), vv(:,:,:,Kbb) )   ! read 3D U and V data at nit000
+            ELSE
                uu  (:,:,:,Kbb) = 0._wp               ! set the ocean at rest
                vv  (:,:,:,Kbb) = 0._wp  
+            ENDIF
                !
-            ELSE                                 ! user defined initial T and S
+               !
+            IF( .NOT. ln_tsd_init .AND. .NOT. ln_uvd_init ) THEN
                DO jk = 1, jpk
                   zgdept(:,:,jk) = gdept(:,:,jk,Kbb)
@@ -130 +134 @@
             vv    (:,:,:,Kmm) = vv   (:,:,:,Kbb)
 
-         !
-!!gm ==>>>  to be moved in usrdef_istate of C1D case 
-         IF ( ln_uvd_init .AND. lk_c1d ) THEN ! read 3D U and V data at nit000
-            ALLOCATE( zuvd(jpi,jpj,jpk,2) )
-            CALL dta_uvd( nit000, Kbb, zuvd )
-            uu(:,:,:,Kbb) = zuvd(:,:,:,1)  ;  uu(:,:,:,Kmm) = uu(:,:,:,Kbb)
-            vv(:,:,:,Kbb) = zuvd(:,:,:,2)  ;  vv(:,:,:,Kmm) = vv(:,:,:,Kbb)
-            DEALLOCATE( zuvd )
-         ENDIF
-         !
-         ! 
          ENDIF 
 #if defined key_agrif