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 14644 for NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/OBS/obs_read_prof.F90 – NEMO

Ignore:
Timestamp:
2021-03-26T15:33:49+01:00 (3 years ago)
Author:
sparonuz
Message:

Merge trunk -r14642:HEAD

Location:
NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final

    • Property svn:externals

      •  

        old new  
        99 
        1010# SETTE 
        11 ^/utils/CI/sette_wave@13990         sette 
         11^/utils/CI/sette@14244        sette 

  • NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/OBS/obs_read_prof.F90

    r14056 r14644  
    404404               IF ( ( inpfiles(jj)%ptim(ji) >  djulini(jj) ) .AND. & 
    405405                  & ( inpfiles(jj)%ptim(ji) <= djulend(jj) )       ) THEN 
    406                   IF ( nproc == 0 ) THEN 
    407                      IF ( inpfiles(jj)%iproc(ji,1) >  nproc ) CYCLE 
     406                  IF ( narea == 1 ) THEN 
     407                     IF ( inpfiles(jj)%iproc(ji,1) >  narea-1 ) CYCLE 
    408408                  ELSE 
    409                      IF ( inpfiles(jj)%iproc(ji,1) /= nproc ) CYCLE 
     409                     IF ( inpfiles(jj)%iproc(ji,1) /= narea-1 ) CYCLE 
    410410                  ENDIF 
    411411                  llvalprof = .FALSE. 
    … …  
    538538            & ( inpfiles(jj)%ptim(ji) <= djulend(jj) ) ) THEN 
    539539 
    540             IF ( nproc == 0 ) THEN 
    541                IF ( inpfiles(jj)%iproc(ji,1) >  nproc ) CYCLE 
     540            IF ( narea == 1 ) THEN 
     541               IF ( inpfiles(jj)%iproc(ji,1) >  narea-1 ) CYCLE 
    542542            ELSE 
    543                IF ( inpfiles(jj)%iproc(ji,1) /= nproc ) CYCLE 
     543               IF ( inpfiles(jj)%iproc(ji,1) /= narea-1 ) CYCLE 
    544544            ENDIF 
    545545 
Note: See TracChangeset for help on using the changeset viewer.