Changeset 14275 for NEMO/trunk/src/OCE/OBS
- Timestamp:
- 2021-01-07T13:13:16+01:00 (3 years ago)
- Location:
- NEMO/trunk/src/OCE/OBS
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/src/OCE/OBS/obs_averg_h2d.F90
r12377 r14275 21 21 & e1t, e2t, & 22 22 & e1f, e2f, & 23 & glamt, gphit, & 24 & nproc 23 & glamt, gphit 25 24 USE in_out_manager 26 25 USE obs_const, ONLY : & -
NEMO/trunk/src/OCE/OBS/obs_grid.F90
r13286 r14275 130 130 CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, & 131 131 & 1, jpi, 1, jpj, & 132 & n proc, jpnij,&132 & narea-1, jpnij, & 133 133 & glamt, gphit, tmask, & 134 134 & kobsin, plam, pphi, & … … 137 137 CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, & 138 138 & 1, jpi, 1, jpj, & 139 & n proc, jpnij,&139 & narea-1, jpnij, & 140 140 & glamu, gphiu, umask, & 141 141 & kobsin, plam, pphi, & … … 144 144 CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, & 145 145 & 1, jpi, 1, jpj, & 146 & n proc, jpnij,&146 & narea-1, jpnij, & 147 147 & glamv, gphiv, vmask, & 148 148 & kobsin, plam, pphi, & … … 151 151 CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, & 152 152 & 1, jpi, 1, jpj, & 153 & n proc, jpnij,&153 & narea-1, jpnij, & 154 154 & glamf, gphif, fmask, & 155 155 & kobsin, plam, pphi, & … … 176 176 !! 177 177 !! ** Action : Return kproc holding the observation and kiobsi,kobsj 178 !! valid on kproc=n procprocessor only.178 !! valid on kproc=narea-1 processor only. 179 179 !! 180 180 !! History : … … 248 248 jlon = jpiglo 249 249 jlat = jpjglo 250 joffset = n proc250 joffset = narea-1 251 251 jostride = jpnij 252 252 ELSE … … 513 513 IF ( ABS( zlam - zplam(jo) ) < 1e-6 ) THEN 514 514 IF ( llinvalidcell(ji,jj) ) THEN 515 kproc(jo) = n proc+ 1000000515 kproc(jo) = narea-1 + 1000000 516 516 kobsi(jo) = ji + 1 517 517 kobsj(jo) = jj + 1 518 518 CYCLE 519 519 ELSE 520 kproc(jo) = n proc520 kproc(jo) = narea-1 521 521 kobsi(jo) = ji + 1 522 522 kobsj(jo) = jj + 1 … … 552 552 & zlamtm(:,ji,jj), zphitm(:,ji,jj) ) ) THEN 553 553 IF ( llinvalidcell(ji,jj) ) THEN 554 kproc(jo) = n proc+ 1000000554 kproc(jo) = narea-1 + 1000000 555 555 kobsi(jo) = ji + 1 556 556 kobsj(jo) = jj + 1 557 557 CYCLE 558 558 ELSE 559 kproc(jo) = n proc559 kproc(jo) = narea-1 560 560 kobsi(jo) = ji + 1 561 561 kobsj(jo) = jj + 1 … … 584 584 & zlamtm(:,ji,jj), zphitm(:,ji,jj) ) ) THEN 585 585 IF ( llinvalidcell(ji,jj) ) THEN 586 kproc(jo) = n proc+ 1000000586 kproc(jo) = narea-1 + 1000000 587 587 kobsi(jo) = ji + 1 588 588 kobsj(jo) = jj + 1 589 589 CYCLE 590 590 ELSE 591 kproc(jo) = n proc591 kproc(jo) = narea-1 592 592 kobsi(jo) = ji + 1 593 593 kobsj(jo) = jj + 1 … … 716 716 ! define the following format: "(a,a,ix.x,a,ix.x,a,ix.x,a)" 717 717 WRITE(clfmt, "('(a,a,i', i1, '.', i1',a,i', i1, '.', i1',a,i', i1, '.', i1',a)')") idg, idg, idg, idg, idg, idg 718 WRITE(cfname, clfmt ) TRIM(cn_gridsearchfile),'_', n proc,'of', jpni,'by', jpnj,'.nc'718 WRITE(cfname, clfmt ) TRIM(cn_gridsearchfile),'_', narea-1,'of', jpni,'by', jpnj,'.nc' 719 719 ENDIF 720 720 … … 820 820 CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, & 821 821 & 1, jpi, 1, jpj, & 822 & n proc, jpnij,&822 & narea-1, jpnij, & 823 823 & glamt, gphit, tmask, & 824 824 & nlons*nlats, lonsi, latsi, & … … 1070 1070 1071 1071 IF ( ( .NOT. ln_grid_global ) .OR. & 1072 & ( ( ln_grid_global ) .AND. ( n proc==0 ) ) ) THEN1072 & ( ( ln_grid_global ) .AND. ( narea-1==0 ) ) ) THEN 1073 1073 1074 1074 CALL chkerr( nf90_create (TRIM(cfname), nf90_clobber, idfile), & -
NEMO/trunk/src/OCE/OBS/obs_mpp.F90
r14229 r14275 18 18 !! obs_mpp_sum_integer : Sum an integer from all processors 19 19 !!---------------------------------------------------------------------- 20 USE dom_oce, ONLY : nproc, mig, mjg ! Ocean space and time domain variables21 20 USE mpp_map, ONLY : mppmap 22 21 USE in_out_manager -
NEMO/trunk/src/OCE/OBS/obs_prep.F90
r14056 r14275 62 62 !! * Modules used 63 63 USE par_oce ! Ocean parameters 64 USE dom_oce, ONLY : glamt, gphit, tmask , nproc! Geographical information64 USE dom_oce, ONLY : glamt, gphit, tmask ! Geographical information 65 65 !! * Arguments 66 66 TYPE(obs_surf), INTENT(INOUT) :: surfdata ! Full set of surface data … … 263 263 USE par_oce ! Ocean parameters 264 264 USE dom_oce, ONLY : & ! Geographical information 265 & gdept_1d, & 266 & nproc 265 & gdept_1d 267 266 268 267 !! * Arguments -
NEMO/trunk/src/OCE/OBS/obs_read_prof.F90
r14056 r14275 404 404 IF ( ( inpfiles(jj)%ptim(ji) > djulini(jj) ) .AND. & 405 405 & ( inpfiles(jj)%ptim(ji) <= djulend(jj) ) ) THEN 406 IF ( n proc == 0) THEN407 IF ( inpfiles(jj)%iproc(ji,1) > n proc) CYCLE406 IF ( narea == 1 ) THEN 407 IF ( inpfiles(jj)%iproc(ji,1) > narea-1 ) CYCLE 408 408 ELSE 409 IF ( inpfiles(jj)%iproc(ji,1) /= n proc) CYCLE409 IF ( inpfiles(jj)%iproc(ji,1) /= narea-1 ) CYCLE 410 410 ENDIF 411 411 llvalprof = .FALSE. … … 538 538 & ( inpfiles(jj)%ptim(ji) <= djulend(jj) ) ) THEN 539 539 540 IF ( n proc == 0) THEN541 IF ( inpfiles(jj)%iproc(ji,1) > n proc) CYCLE540 IF ( narea == 1 ) THEN 541 IF ( inpfiles(jj)%iproc(ji,1) > narea-1 ) CYCLE 542 542 ELSE 543 IF ( inpfiles(jj)%iproc(ji,1) /= n proc) CYCLE543 IF ( inpfiles(jj)%iproc(ji,1) /= narea-1 ) CYCLE 544 544 ENDIF 545 545 -
NEMO/trunk/src/OCE/OBS/obs_read_surf.F90
r14056 r14275 300 300 IF ( ( inpfiles(jj)%ptim(ji) > djulini(jj) ) .AND. & 301 301 & ( inpfiles(jj)%ptim(ji) <= djulend(jj) ) ) THEN 302 IF ( n proc == 0) THEN303 IF ( inpfiles(jj)%iproc(ji,1) > n proc) CYCLE302 IF ( narea == 1 ) THEN 303 IF ( inpfiles(jj)%iproc(ji,1) > narea-1 ) CYCLE 304 304 ELSE 305 IF ( inpfiles(jj)%iproc(ji,1) /= n proc) CYCLE305 IF ( inpfiles(jj)%iproc(ji,1) /= narea-1 ) CYCLE 306 306 ENDIF 307 307 llvalprof = .FALSE. … … 371 371 & ( inpfiles(jj)%ptim(ji) <= djulend(jj) ) ) THEN 372 372 373 IF ( n proc == 0) THEN374 IF ( inpfiles(jj)%iproc(ji,1) > n proc) CYCLE373 IF ( narea == 1 ) THEN 374 IF ( inpfiles(jj)%iproc(ji,1) > narea-1 ) CYCLE 375 375 ELSE 376 IF ( inpfiles(jj)%iproc(ji,1) /= n proc) CYCLE376 IF ( inpfiles(jj)%iproc(ji,1) /= narea-1 ) CYCLE 377 377 ENDIF 378 378 -
NEMO/trunk/src/OCE/OBS/obs_utils.F90
r10068 r14275 66 66 !! * Modules used 67 67 USE netcdf ! NetCDF library 68 USE dom_oce, ONLY : & ! Ocean space and time domain variables69 & nproc70 68 71 69 !! * Arguments … … 102 100 !! * Modules used 103 101 USE netcdf ! NetCDF library 104 USE dom_oce, ONLY : & ! Ocean space and time domain variables105 & nproc106 102 107 103 !! * Arguments -
NEMO/trunk/src/OCE/OBS/obs_write.F90
r14056 r14275 210 210 idg = MAX( INT(LOG10(REAL(jpnij,wp))) + 1, 4 ) ! how many digits to we need to write? min=4, max=9 211 211 WRITE(clfmt, "('(a,a,i', i1, '.', i1, ',a)')") idg, idg ! '(a,a,ix.x,a)' 212 WRITE(clfname,clfmt) TRIM(clfiletype), '_fdbk_', n proc, '.nc'212 WRITE(clfname,clfmt) TRIM(clfiletype), '_fdbk_', narea-1, '.nc' 213 213 214 214 IF(lwp) THEN … … 475 475 idg = MAX( INT(LOG10(REAL(jpnij,wp))) + 1, 4 ) ! how many digits to we need to write? min=4, max=9 476 476 WRITE(clfmt, "('(a,a,i', i1, '.', i1, ',a)')") idg, idg ! '(a,a,ix.x,a)' 477 WRITE(clfname,clfmt) TRIM(clfiletype), '_fdbk_', n proc, '.nc'477 WRITE(clfname,clfmt) TRIM(clfiletype), '_fdbk_', narea-1, '.nc' 478 478 479 479 IF(lwp) THEN
Note: See TracChangeset
for help on using the changeset viewer.