Changeset 15090 for NEMO/trunk/src/TOP/TRP

Timestamp:

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

Author:

cetlod

Message:

trunk : minor changes in PISCES to make it work in debug mode when nn_hls=2 ( still not working when enabling tiles )

Location:

NEMO/trunk/src/TOP/TRP

Files:

• trcatf.F90 (modified) (2 diffs)
• trcsink.F90 (modified) (4 diffs)
• trdmxl_trc.F90 (modified) (3 diffs)
• trdmxl_trc_rst.F90 (modified) (2 diffs)

NEMO/trunk/src/TOP/TRP/trcatf.F90

@@ -239 +239 @@
       ENDIF
       !
-      DO jn = 1, jptra      
-         DO_3D( 1, 1, 1, 1, 1, jpkm1 )
+      DO jn = 1, jptra  
+         DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 )    
             ze3t_b = 1._wp + r3t(ji,jj,Kbb) * tmask(ji,jj,jk)
             ze3t_n = 1._wp + r3t(ji,jj,Kmm) * tmask(ji,jj,jk)
@@ -313 +313 @@
       !
       DO jn = 1, jptra      
-         DO_3D( 1, 1, 1, 1, 1, jpkm1 )
+         DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 )    
             ze3t_b = e3t(ji,jj,jk,Kbb)
             ze3t_n = e3t(ji,jj,jk,Kmm)

NEMO/trunk/src/TOP/TRP/trcsink.F90

@@ -74 +74 @@
          iiter(:,:) = 1
       ELSE
-         DO_2D( 1, 1, 1, 1 )
+         DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
             iiter(ji,jj) = 1
             DO jk = 1, jpkm1
@@ -86 +86 @@
       ENDIF
 
-      DO_3D( 1, 1, 1, 1, 1,jpkm1 )
+      DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 )
          IF( tmask(ji,jj,jk) == 1.0 ) THEN
            zwsmax = 0.5 * e3t(ji,jj,jk,Kmm) * rday / rsfact
@@ -146 +146 @@
       DO jn = 1, 2
          !  first guess of the slopes interior values
-         DO_2D( 1, 1, 1, 1 )
+         DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
             !
             zstep = rsfact / REAL( kiter(ji,jj), wp ) / 2.
@@ -186 +186 @@
       END DO
 
-      DO_3D( 1, 1, 1, 1, 1,jpkm1 )
+      DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 )
          zflx = ( psinkflx(ji,jj,jk) - psinkflx(ji,jj,jk+1) ) / e3t(ji,jj,jk,Kmm)
          ztrb(ji,jj,jk) = ztrb(ji,jj,jk) + 2. * zflx

NEMO/trunk/src/TOP/TRP/trdmxl_trc.F90

@@ -124 +124 @@
             isum  = 0   ;   zvlmsk(:,:) = 0.e0
 
-            IF( jpktrd_trc < jpk ) THEN                           ! description ???
-               DO_2D( 1, 1, 1, 1 )
+            IF( jpktrd_trc < jpk ) THEN   
+               DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 
                   IF( nmld_trc(ji,jj) <= jpktrd_trc ) THEN
                      zvlmsk(ji,jj) = tmask(ji,jj,1)
@@ -148 +148 @@
          ! ... Weights for vertical averaging
          wkx_trc(:,:,:) = 0.e0
-         DO_3D( 1, 1, 1, 1, 1, jpktrd_trc )                       ! initialize wkx_trc with vertical scale factor in mixed-layer
+         DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpktrd_trc )                    ! description ???
             IF( jk - nmld_trc(ji,jj) < 0 )   wkx_trc(ji,jj,jk) = e3t(ji,jj,jk,Kmm) * tmask(ji,jj,jk)
          END_3D
@@ -259 +259 @@
          !
          DO jn = 1, jptra
-            DO_2D( 1, 1, 1, 1 )
+            DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )                    ! description ???
                ik = nmld_trc(ji,jj)
                IF( ln_trdtrc(jn) )    &

NEMO/trunk/src/TOP/TRP/trdmxl_trc_rst.F90

@@ -12 +12 @@
    USE iom             ! I/O module
    USE trc             ! for ctrcnm
-   USE trdmxl_trc_oce  ! for lk_trdmxl_trc
+   USE trdtrc_oce  ! for lk_trdmxl_trc
 
    IMPLICIT NONE
@@ -53 +53 @@
          clpath = TRIM(cn_trcrst_outdir)
          IF( clpath(LEN_TRIM(clpath):) /= '/' ) clpath = TRIM(clpath) // '/'
-         IF(lwp) WRITE(numout,*) '             open ocean restart_mld_trc NetCDF  'TRIM(clpath)//TRIM(clname)
+         IF(lwp) WRITE(numout,*) '             open ocean restart_mld_trc NetCDF  ', TRIM(clpath)//TRIM(clname)
          CALL iom_open( TRIM(clpath)//TRIM(clname), nummldw_trc, ldwrt = .TRUE. )
       ENDIF