New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 12928 for NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/STO/stopar.F90 – NEMO

Ignore:
Timestamp:
2020-05-14T21:46:00+02:00 (4 years ago)
Author:
smueller
Message:

Synchronizing with /NEMO/trunk@12925 (ticket #2170)

Location:
NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser

    • Property svn:externals
      •  

        old new  
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 
         8 
         9# SETTE 
         10^/utils/CI/sette@HEAD         sette 
  • NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/STO/stopar.F90

    r12178 r12928  
    112112   INTEGER         :: nn_trc_ord = 1          ! order of autoregressive processes 
    113113 
     114   !! * Substitutions 
     115#  include "do_loop_substitute.h90" 
    114116   !!---------------------------------------------------------------------- 
    115117   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
     
    261263 
    262264      ! Read namsto namelist : stochastic parameterization 
    263       REWIND( numnam_ref )              ! Namelist namdyn_adv in reference namelist : Momentum advection scheme 
    264265      READ  ( numnam_ref, namsto, IOSTAT = ios, ERR = 901) 
    265266901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsto in reference namelist' ) 
    266267 
    267       REWIND( numnam_cfg )              ! Namelist namdyn_adv in configuration namelist : Momentum advection scheme 
    268268      READ  ( numnam_cfg, namsto, IOSTAT = ios, ERR = 902 ) 
    269269902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namsto in configuration namelist' ) 
     
    829829      REAL(KIND=8) :: gran   ! Gaussian random number (forced KIND=8 as in kiss_gaussian) 
    830830 
    831       DO jj = 1, jpj 
    832          DO ji = 1, jpi 
    833             CALL kiss_gaussian( gran ) 
    834             psto(ji,jj) = gran 
    835          END DO 
    836       END DO 
     831      DO_2D_11_11 
     832         CALL kiss_gaussian( gran ) 
     833         psto(ji,jj) = gran 
     834      END_2D 
    837835 
    838836   END SUBROUTINE sto_par_white 
     
    849847      INTEGER  :: ji, jj 
    850848 
    851       DO jj = 2, jpj-1 
    852          DO ji = 2, jpi-1 
    853             psto(ji,jj) = 0.5_wp * psto(ji,jj) + 0.125_wp * & 
    854                               &  ( psto(ji-1,jj) + psto(ji+1,jj) +  & 
    855                               &    psto(ji,jj-1) + psto(ji,jj+1) ) 
    856          END DO 
    857       END DO 
     849      DO_2D_00_00 
     850         psto(ji,jj) = 0.5_wp * psto(ji,jj) + 0.125_wp * & 
     851                           &  ( psto(ji-1,jj) + psto(ji+1,jj) +  & 
     852                           &    psto(ji,jj-1) + psto(ji,jj+1) ) 
     853      END_2D 
    858854 
    859855   END SUBROUTINE sto_par_flt 
Note: See TracChangeset for help on using the changeset viewer.