Changeset 15015 for NEMO/branches/2021/ticket2680_C1D_PAPA/tests/ISOMIP+/MY_SRC/dtatsd.F90

Timestamp:

2021-06-17T19:17:25+02:00 (3 years ago)

Author:

gsamson

Message:

merge trunk into branch (#2680)

Location:

NEMO/branches/2021/ticket2680_C1D_PAPA

Files:

• . (modified) (1 prop)
• tests/ISOMIP+/MY_SRC/dtatsd.F90 (modified) (10 diffs)

NEMO/branches/2021/ticket2680_C1D_PAPA

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/ticket2680_C1D_PAPA/tests/ISOMIP+/MY_SRC/dtatsd.F90

@@ -6 +6 @@
    !! History :  OPA  ! 1991-03  ()  Original code
    !!             -   ! 1992-07  (M. Imbard)
-   !!            8.0  ! 1999-10  (M.A. Foujols, M. Imbard)  NetCDF FORMAT 
-   !!   NEMO     1.0  ! 2002-06  (G. Madec)  F90: Free form and module 
+   !!            8.0  ! 1999-10  (M.A. Foujols, M. Imbard)  NetCDF FORMAT
+   !!   NEMO     1.0  ! 2002-06  (G. Madec)  F90: Free form and module
    !!            3.3  ! 2010-10  (C. Bricaud, S. Masson)  use of fldread
    !!            3.4  ! 2010-11  (G. Madec, C. Ethe) Merge of dtatem and dtasal + remove CPP keys
@@ -49 +49 @@
       !!----------------------------------------------------------------------
       !!                   ***  ROUTINE dta_tsd_init  ***
-      !!                    
-      !! ** Purpose :   initialisation of T & S input data 
-      !! 
+      !!
+      !! ** Purpose :   initialisation of T & S input data
+      !!
       !! ** Method  : - Read namtsd namelist
-      !!              - allocates T & S data structure 
+      !!              - allocates T & S data structure
       !!----------------------------------------------------------------------
       LOGICAL, INTENT(in), OPTIONAL ::   ld_tradmp   ! force the initialization when tradp is used
@@ -77 +77 @@
 
       IF( PRESENT( ld_tradmp ) )   ln_tsd_dmp = .TRUE.     ! forces the initialization when tradmp is used
-      
+
       IF(lwp) THEN                  ! control print
          WRITE(numout,*)
@@ -114 +114 @@
             CALL ctl_stop( 'dta_tsd : unable to allocate T & S data arrays' )   ;   RETURN
          ENDIF
-         !
          !                         ! fill sf_tsd with sn_tem & sn_sal and control print
          slf_i(jp_tem) = sn_tem   ;   slf_i(jp_sal) = sn_sal
@@ -150 +149 @@
       !!----------------------------------------------------------------------
       !!                   ***  ROUTINE dta_tsd  ***
-      !!                    
+      !!
       !! ** Purpose :   provides T and S data at kt
-      !! 
+      !!
       !! ** Method  : - call fldread routine
-      !!              - ORCA_R2: add some hand made alteration to read data  
+      !!              - ORCA_R2: add some hand made alteration to read data
       !!              - 'key_orca_lev10' interpolates on 10 times more levels
       !!              - s- or mixed z-s coordinate: vertical interpolation on model mesh
@@ -162 +161 @@
       !! ** Action  :   ptsd   T-S data on medl mesh and interpolated at time-step kt
       !!----------------------------------------------------------------------
-      INTEGER                              , INTENT(in   ) ::   kt     ! ocean time-step
-      CHARACTER(LEN=3)                     , INTENT(in   ) ::   cddta  ! dmp or ini
+      INTEGER                          , INTENT(in   ) ::   kt     ! ocean time-step
+      CHARACTER(LEN=3)                 , INTENT(in   ) ::   cddta  ! dmp or ini
       REAL(wp), DIMENSION(A2D(nn_hls),jpk,jpts), INTENT(  out) ::   ptsd   ! T & S data
       !
@@ -224 +223 @@
                      IF( (zl-gdept_1d(jkk)) * (zl-gdept_1d(jkk+1)) <= 0._wp ) THEN
                         zi = ( zl - gdept_1d(jkk) ) / (gdept_1d(jkk+1)-gdept_1d(jkk))
-                        ztp(jk) = ptsd(ji,jj,jkk,jp_tem) + ( ptsd(ji,jj,jkk+1,jp_tem) - ptsd(ji,jj,jkk,jp_tem) ) * zi 
+                        ztp(jk) = ptsd(ji,jj,jkk,jp_tem) + ( ptsd(ji,jj,jkk+1,jp_tem) - ptsd(ji,jj,jkk,jp_tem) ) * zi
                         zsp(jk) = ptsd(ji,jj,jkk,jp_sal) + ( ptsd(ji,jj,jkk+1,jp_sal) - ptsd(ji,jj,jkk,jp_sal) ) * zi
                      ENDIF
@@ -237 +236 @@
             ptsd(ji,jj,jpk,jp_sal) = 0._wp
          END_2D
-         ! 
+         !
       ELSE                                !==   z- or zps- coordinate   ==!
-         !                             
+         !
          DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpk )
             ptsd(ji,jj,jk,jp_tem) = ptsd(ji,jj,jk,jp_tem) * tmask(ji,jj,jk)    ! Mask
@@ -247 +246 @@
          IF( ln_zps ) THEN                      ! zps-coordinate (partial steps) interpolation at the last ocean level
             DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
-               ik = mbkt(ji,jj) 
+               ik = mbkt(ji,jj)
                IF( ik > 1 ) THEN
                   zl = ( gdept_1d(ik) - gdept_0(ji,jj,ik) ) / ( gdept_1d(ik) - gdept_1d(ik-1) )
@@ -255 +254 @@
                ik = mikt(ji,jj)
                IF( ik > 1 ) THEN
-                  zl = ( gdept_0(ji,jj,ik) - gdept_1d(ik) ) / ( gdept_1d(ik+1) - gdept_1d(ik) ) 
+                  zl = ( gdept_0(ji,jj,ik) - gdept_1d(ik) ) / ( gdept_1d(ik+1) - gdept_1d(ik) )
                   ptsd(ji,jj,ik,jp_tem) = (1.-zl) * ptsd(ji,jj,ik,jp_tem) + zl * ptsd(ji,jj,ik+1,jp_tem)
                   ptsd(ji,jj,ik,jp_sal) = (1.-zl) * ptsd(ji,jj,ik,jp_sal) + zl * ptsd(ji,jj,ik+1,jp_sal)

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+