Changeset 12377 for NEMO/trunk/src/OCE/STO
- Timestamp:
- 2020-02-12T15:39:06+01:00 (4 years ago)
- Location:
- NEMO/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk
- Property svn:externals
-
old new 3 3 ^/utils/build/mk@HEAD mk 4 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev @HEAD ext/AGRIF5 ^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL
-
- Property svn:externals
-
NEMO/trunk/src/OCE/STO/stopar.F90
r11536 r12377 112 112 INTEGER :: nn_trc_ord = 1 ! order of autoregressive processes 113 113 114 !! * Substitutions 115 # include "do_loop_substitute.h90" 114 116 !!---------------------------------------------------------------------- 115 117 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 261 263 262 264 ! Read namsto namelist : stochastic parameterization 263 REWIND( numnam_ref ) ! Namelist namdyn_adv in reference namelist : Momentum advection scheme264 265 READ ( numnam_ref, namsto, IOSTAT = ios, ERR = 901) 265 266 901 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsto in reference namelist' ) 266 267 267 REWIND( numnam_cfg ) ! Namelist namdyn_adv in configuration namelist : Momentum advection scheme268 268 READ ( numnam_cfg, namsto, IOSTAT = ios, ERR = 902 ) 269 269 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namsto in configuration namelist' ) … … 829 829 REAL(KIND=8) :: gran ! Gaussian random number (forced KIND=8 as in kiss_gaussian) 830 830 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 837 835 838 836 END SUBROUTINE sto_par_white … … 849 847 INTEGER :: ji, jj 850 848 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 858 854 859 855 END SUBROUTINE sto_par_flt -
NEMO/trunk/src/OCE/STO/stopts.F90
r10425 r12377 26 26 27 27 !! * Substitutions 28 # include " vectopt_loop_substitute.h90"28 # include "do_loop_substitute.h90" 29 29 !!---------------------------------------------------------------------- 30 30 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 95 95 ! Eliminate any possible negative salinity 96 96 DO jdof = 1, nn_sto_eos 97 DO jk = 1, jpkm1 98 DO jj = 1, jpj 99 DO ji = 1, jpi 100 pts_ran(ji,jj,jk,jp_sal,jdof) = MIN( ABS(pts_ran(ji,jj,jk,jp_sal,jdof)) , & 101 & MAX(pts(ji,jj,jk,jp_sal),0._wp) ) & 102 & * SIGN(1._wp,pts_ran(ji,jj,jk,jp_sal,jdof)) 103 END DO 104 END DO 105 END DO 97 DO_3D_11_11( 1, jpkm1 ) 98 pts_ran(ji,jj,jk,jp_sal,jdof) = MIN( ABS(pts_ran(ji,jj,jk,jp_sal,jdof)) , & 99 & MAX(pts(ji,jj,jk,jp_sal),0._wp) ) & 100 & * SIGN(1._wp,pts_ran(ji,jj,jk,jp_sal,jdof)) 101 END_3D 106 102 END DO 107 103 -
NEMO/trunk/src/OCE/STO/storng.F90
r10069 r12377 57 57 REAL(KIND=wp), SAVE :: gran1, gran2 58 58 59 !! * Substitutions 60 # include "do_loop_substitute.h90" 59 61 !!---------------------------------------------------------------------- 60 62 !! NEMO/OCE 4.0 , NEMO Consortium (2018)
Note: See TracChangeset
for help on using the changeset viewer.