Changeset 13295 for NEMO/trunk/src/OCE/STO

Timestamp:

2020-07-10T20:24:21+02:00 (4 years ago)

Author:

acc

Message:

Replace do-loop macros in the trunk with alternative forms with greater flexibility for extra halo applications. This alters a lot of routines but does not change any behaviour or results. do_loop_substitute.h90 is greatly simplified by this change. SETTE results are identical to those with the previous revision

Location:

NEMO/trunk/src/OCE/STO

Files:

• stopar.F90 (modified) (2 diffs)
• stopts.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/STO/stopar.F90

@@ -837 +837 @@
       REAL(wp) :: gran   ! Gaussian random number (forced KIND=8 as in kiss_gaussian)
 
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          CALL kiss_gaussian( gran )
          psto(ji,jj) = gran
@@ -855 +855 @@
       INTEGER  :: ji, jj
 
-      DO_2D_00_00
+      DO_2D( 0, 0, 0, 0 )
          psto(ji,jj) = 0.5_wp * psto(ji,jj) + 0.125_wp * &
                            &  ( psto(ji-1,jj) + psto(ji+1,jj) +  &

NEMO/trunk/src/OCE/STO/stopts.F90

@@ -95 +95 @@
       ! Eliminate any possible negative salinity
       DO jdof = 1, nn_sto_eos
-         DO_3D_11_11( 1, jpkm1 )
+         DO_3D( 1, 1, 1, 1, 1, jpkm1 )
             pts_ran(ji,jj,jk,jp_sal,jdof) = MIN( ABS(pts_ran(ji,jj,jk,jp_sal,jdof)) ,  &
                                           &      MAX(pts(ji,jj,jk,jp_sal),0._wp) )     &