- Timestamp:
- 2021-06-17T19:17:25+02:00 (3 years ago)
- Location:
- NEMO/branches/2021/ticket2680_C1D_PAPA
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/NST/agrif_oce_sponge.F90 (modified) (20 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2021/ticket2680_C1D_PAPA
- Property svn:externals
-
old new 9 9 10 10 # SETTE 11 ^/utils/CI/sette@14244 sette 11 ^/utils/CI/sette@HEAD sette 12
-
- Property svn:externals
-
NEMO/branches/2021/ticket2680_C1D_PAPA/src/NST/agrif_oce_sponge.F90
r14433 r15015 150 150 ztabramp(:,:) = 0._wp 151 151 152 IF( lk_west ) THEN 153 ind1 = nn_hls + 1 + nbghostcells ! halo + land+ nbghostcells154 ind2 = nn_hls + 1 +nbghostcells + ispongearea152 IF( lk_west ) THEN ! --- West --- ! 153 ind1 = nn_hls + nbghostcells ! halo + nbghostcells 154 ind2 = nn_hls + nbghostcells + ispongearea 155 155 DO ji = mi0(ind1), mi1(ind2) 156 156 DO jj = 1, jpj … … 160 160 ! ghost cells: 161 161 ind1 = 1 162 ind2 = nn_hls + 1 + nbghostcells ! halo + land+ nbghostcells162 ind2 = nn_hls + nbghostcells ! halo + nbghostcells 163 163 DO ji = mi0(ind1), mi1(ind2) 164 164 DO jj = 1, jpj … … 168 168 ENDIF 169 169 IF( lk_east ) THEN ! --- East --- ! 170 ind1 = jpiglo - ( nn_hls + nbghostcells ) - ispongearea - 1171 ind2 = jpiglo - ( nn_hls + nbghostcells ) - 1 ! halo + land + nbghostcells - 1170 ind1 = jpiglo - ( nn_hls + nbghostcells -1 ) - ispongearea - 1 171 ind2 = jpiglo - ( nn_hls + nbghostcells -1 ) - 1 ! halo + land + nbghostcells - 1 172 172 DO ji = mi0(ind1), mi1(ind2) 173 173 DO jj = 1, jpj … … 176 176 END DO 177 177 ! ghost cells: 178 ind1 = jpiglo - ( nn_hls + nbghostcells ) - 1 ! halo + land + nbghostcells - 1178 ind1 = jpiglo - ( nn_hls + nbghostcells -1 ) - 1 ! halo + land + nbghostcells - 1 179 179 ind2 = jpiglo - 1 180 180 DO ji = mi0(ind1), mi1(ind2) … … 185 185 ENDIF 186 186 IF( lk_south ) THEN ! --- South --- ! 187 ind1 = nn_hls + 1 + nbghostcells ! halo + land+ nbghostcells188 ind2 = nn_hls + 1 +nbghostcells + jspongearea187 ind1 = nn_hls + nbghostcells ! halo + nbghostcells 188 ind2 = nn_hls + nbghostcells + jspongearea 189 189 DO jj = mj0(ind1), mj1(ind2) 190 190 DO ji = 1, jpi … … 194 194 ! ghost cells: 195 195 ind1 = 1 196 ind2 = nn_hls + 1 + nbghostcells ! halo + land+ nbghostcells196 ind2 = nn_hls + nbghostcells ! halo + nbghostcells 197 197 DO jj = mj0(ind1), mj1(ind2) 198 198 DO ji = 1, jpi … … 202 202 ENDIF 203 203 IF( lk_north ) THEN ! --- North --- ! 204 ind1 = jpjglo - ( nn_hls + nbghostcells ) - jspongearea - 1205 ind2 = jpjglo - ( nn_hls + nbghostcells ) - 1 ! halo + land+ nbghostcells - 1204 ind1 = jpjglo - ( nn_hls + nbghostcells -1 ) - jspongearea - 1 205 ind2 = jpjglo - ( nn_hls + nbghostcells -1 ) - 1 ! halo + nbghostcells - 1 206 206 DO jj = mj0(ind1), mj1(ind2) 207 207 DO ji = 1, jpi … … 210 210 END DO 211 211 ! ghost cells: 212 ind1 = jpjglo - ( nn_hls + nbghostcells ) ! halo + land + nbghostcells - 1212 ind1 = jpjglo - ( nn_hls + nbghostcells -1 ) ! halo + land + nbghostcells - 1 213 213 ind2 = jpjglo 214 214 DO jj = mj0(ind1), mj1(ind2) … … 284 284 285 285 IF( lk_west ) THEN ! --- West --- ! 286 ind1 = nn_hls + 1 +nbghostcells + ishift287 ind2 = nn_hls + 1 +nbghostcells + ishift + ispongearea286 ind1 = nn_hls + nbghostcells + ishift 287 ind2 = nn_hls + nbghostcells + ishift + ispongearea 288 288 DO ji = mi0(ind1), mi1(ind2) 289 289 DO jj = 1, jpj … … 293 293 ! ghost cells: 294 294 ind1 = 1 295 ind2 = nn_hls + 1 + nbghostcells + ishift ! halo + land+ nbghostcells295 ind2 = nn_hls + nbghostcells + ishift ! halo + nbghostcells 296 296 DO ji = mi0(ind1), mi1(ind2) 297 297 DO jj = 1, jpj … … 301 301 ENDIF 302 302 IF( lk_east ) THEN ! --- East --- ! 303 ind1 = jpiglo - ( nn_hls + nbghostcells + ishift) - ispongearea - 1304 ind2 = jpiglo - ( nn_hls + nbghostcells + ishift) - 1 ! halo + land+ nbghostcells - 1303 ind1 = jpiglo - ( nn_hls + nbghostcells -1 + ishift) - ispongearea - 1 304 ind2 = jpiglo - ( nn_hls + nbghostcells -1 + ishift) - 1 ! halo + nbghostcells - 1 305 305 DO ji = mi0(ind1), mi1(ind2) 306 306 DO jj = 1, jpj … … 309 309 END DO 310 310 ! ghost cells: 311 ind1 = jpiglo - ( nn_hls + nbghostcells + ishift) - 1 ! halo + land+ nbghostcells - 1311 ind1 = jpiglo - ( nn_hls + nbghostcells -1 + ishift) - 1 ! halo + nbghostcells - 1 312 312 ind2 = jpiglo - 1 313 313 DO ji = mi0(ind1), mi1(ind2) … … 318 318 ENDIF 319 319 IF( lk_south ) THEN ! --- South --- ! 320 ind1 = nn_hls + 1 + nbghostcells + jshift ! halo + land+ nbghostcells321 ind2 = nn_hls + 1 +nbghostcells + jshift + jspongearea320 ind1 = nn_hls + nbghostcells + jshift ! halo + nbghostcells 321 ind2 = nn_hls + nbghostcells + jshift + jspongearea 322 322 DO jj = mj0(ind1), mj1(ind2) 323 323 DO ji = 1, jpi … … 327 327 ! ghost cells: 328 328 ind1 = 1 329 ind2 = nn_hls + 1 +nbghostcells + jshift ! halo + land + nbghostcells329 ind2 = nn_hls + nbghostcells + jshift ! halo + land + nbghostcells 330 330 DO jj = mj0(ind1), mj1(ind2) 331 331 DO ji = 1, jpi … … 335 335 ENDIF 336 336 IF( lk_north ) THEN ! --- North --- ! 337 ind1 = jpjglo - ( nn_hls + nbghostcells + jshift) - jspongearea - 1338 ind2 = jpjglo - ( nn_hls + nbghostcells + jshift) - 1 ! halo + land + nbghostcells - 1337 ind1 = jpjglo - ( nn_hls + nbghostcells -1 + jshift) - jspongearea - 1 338 ind2 = jpjglo - ( nn_hls + nbghostcells -1 + jshift) - 1 ! halo + land + nbghostcells - 1 339 339 DO jj = mj0(ind1), mj1(ind2) 340 340 DO ji = 1, jpi … … 343 343 END DO 344 344 ! ghost cells: 345 ind1 = jpjglo - ( nn_hls + nbghostcells + jshift) ! halo + land + nbghostcells - 1345 ind1 = jpjglo - ( nn_hls + nbghostcells -1 + jshift) ! halo + land + nbghostcells - 1 346 346 ind2 = jpjglo 347 347 DO jj = mj0(ind1), mj1(ind2) … … 741 741 742 742 jmax = j2-1 743 ind1 = jpjglo - ( nn_hls + nbghostcells + 2) ! North743 ind1 = jpjglo - ( nn_hls + nbghostcells + 1 ) ! North 744 744 DO jj = mj0(ind1), mj1(ind1) 745 745 jmax = MIN(jmax,jj) … … 905 905 906 906 imax = i2 - 1 907 ind1 = jpiglo - ( nn_hls + nbghostcells + 2) ! East907 ind1 = jpiglo - ( nn_hls + nbghostcells + 1 ) ! East 908 908 DO ji = mi0(ind1), mi1(ind1) 909 909 imax = MIN(imax,ji) … … 1005 1005 1006 1006 jmax = j2-1 1007 ind1 = jpjglo - ( nn_hls + nbghostcells + 2) ! North1007 ind1 = jpjglo - ( nn_hls + nbghostcells + 1 ) ! North 1008 1008 DO jj = mj0(ind1), mj1(ind1) 1009 1009 jmax = MIN(jmax,jj) … … 1072 1072 1073 1073 imax = i2 - 1 1074 ind1 = jpiglo - ( nn_hls + nbghostcells + 2) ! East1074 ind1 = jpiglo - ( nn_hls + nbghostcells + 1 ) ! East 1075 1075 DO ji = mi0(ind1), mi1(ind1) 1076 1076 imax = MIN(imax,ji)
Note: See TracChangeset
for help on using the changeset viewer.
