Changeset 15023 for NEMO/trunk/tests/ISOMIP+/MY_SRC

Timestamp:

2021-06-18T16:35:25+02:00 (3 years ago)

Author:

gsamson

Message:

merge ticket2680_C1D_PAPA branch back into the trunk; see ticket #2680 for details

File:

• NEMO/trunk/tests/ISOMIP+/MY_SRC/istate.F90 (modified) (3 diffs)

NEMO/trunk/tests/ISOMIP+/MY_SRC/istate.F90

@@ -74 +74 @@
       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
@@ -113 +112 @@
             IF( ln_tsd_init ) THEN               
                CALL dta_tsd( nit000, 'ini', 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)
@@ -127 +132 @@
             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