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 8126 – NEMO

Changeset 8126


Ignore:
Timestamp:
2017-06-02T09:53:43+02:00 (7 years ago)
Author:
cbricaud
Message:

fix in trunk ticket #1906

Location:
trunk/NEMOGCM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

    r7646 r8126  
    240240           !debug this section computing ? 
    241241           lldebug=.FALSE. 
    242            IF( (jsec==nn_secdebug .OR. nn_secdebug==-1) .AND.  kt==nit000+nn_dct-1 .AND. lwp ) lldebug=.TRUE.  
     242           IF( (jsec==nn_secdebug .OR. nn_secdebug==-1) .AND.  kt==nit000+nn_dct-1 ) lldebug=.TRUE.  
    243243 
    244244           !Compute transport through section   
     
    249249        IF( MOD(kt,nn_dctwri)==0 )THEN 
    250250 
    251            IF( lwp .AND. kt==nit000+nn_dctwri-1 )WRITE(numout,*)"      diadct: average transports and write at kt = ",kt          
     251           IF( kt==nit000+nn_dctwri-1 )WRITE(numout,*)"      diadct: average transports and write at kt = ",kt          
    252252   
    253253           !! divide arrays by nn_dctwri/nn_dct to obtain average  
     
    335335     DO jsec=1,nb_sec_max      !loop on the nb_sec sections 
    336336 
    337         IF ( lwp .AND. ( jsec==nn_secdebug .OR. nn_secdebug==-1 ) ) & 
     337        IF (  jsec==nn_secdebug .OR. nn_secdebug==-1 ) & 
    338338           & WRITE(numout,*)'debuging for section number: ',jsec  
    339339 
     
    355355        IF( jsec .NE. isec )  CALL ctl_stop( cltmp ) 
    356356 
    357         IF( lwp .AND. ( jsec==nn_secdebug .OR. nn_secdebug==-1 ) )WRITE(numout,*)"isec ",isec  
     357        IF( jsec==nn_secdebug .OR. nn_secdebug==-1 )WRITE(numout,*)"isec ",isec  
    358358 
    359359        READ(numdct_in)secs(jsec)%name 
     
    374374        !----- 
    375375 
    376         IF( lwp .AND. ( jsec==nn_secdebug .OR. nn_secdebug==-1 ) )THEN 
     376        IF( jsec==nn_secdebug .OR. nn_secdebug==-1 )THEN 
    377377           
    378378            WRITE(clformat,'(a,i2,a)') '(A40,', nb_class_max,'(f8.3,1X))'  
     
    407407           !debug 
    408408           !----- 
    409            IF( lwp .AND. ( jsec==nn_secdebug .OR. nn_secdebug==-1 ) )THEN 
     409           IF( jsec==nn_secdebug .OR. nn_secdebug==-1 )THEN 
    410410              WRITE(numout,*)"      List of points in global domain:" 
    411411              DO jpt=1,iptglo 
     
    441441           !debug 
    442442           !----- 
    443            IF(   lwp .AND. ( jsec==nn_secdebug .OR. nn_secdebug==-1 ) )THEN 
     443           IF( jsec==nn_secdebug .OR. nn_secdebug==-1 )THEN 
    444444              WRITE(numout,*)"      List of points selected by the proc:" 
    445445              DO jpt = 1,iptloc 
     
    459459           !remove redundant points between processors 
    460460           !------------------------------------------ 
    461            lldebug = .FALSE. ; IF ( (jsec==nn_secdebug .OR. nn_secdebug==-1) .AND. lwp ) lldebug = .TRUE. 
     461           lldebug = .FALSE. ; IF ( jsec==nn_secdebug .OR. nn_secdebug==-1 ) lldebug = .TRUE. 
    462462           IF( iptloc .NE. 0 )THEN 
    463463              CALL removepoints(secs(jsec),'I','top_list',lldebug) 
     
    475475           !debug 
    476476           !----- 
    477            IF( lwp .AND. ( jsec==nn_secdebug .OR. nn_secdebug==-1 ) )THEN 
     477           IF( jsec==nn_secdebug .OR. nn_secdebug==-1 )THEN 
    478478              WRITE(numout,*)"      List of points after removepoints:" 
    479479              iptloc = secs(jsec)%nb_point 
     
    487487 
    488488        ELSE  ! iptglo = 0 
    489            IF( lwp .AND. ( jsec==nn_secdebug .OR. nn_secdebug==-1 ) )& 
     489           IF( jsec==nn_secdebug .OR. nn_secdebug==-1 )& 
    490490              WRITE(numout,*)'   No points for this section.' 
    491491        ENDIF 
     
    695695            !     LOOP ON THE LEVEL     |  
    696696            !---------------------------|  
    697             DO jk = 1, mbathy(k%I,k%J)            !Sum of the transport on the vertical 
     697            DO jk = 1, mbkt(k%I,k%J)            !Sum of the transport on the vertical 
    698698            !           ! compute temperature, salinity, insitu & potential density, ssh and depth at U/V point  
    699699            SELECT CASE( sec%direction(jseg) ) 
     
    874874           !---------------------------|  
    875875           !Sum of the transport on the vertical   
    876            DO jk=1,mbathy(k%I,k%J)  
     876           DO jk=1,mbkt(k%I,k%J)  
    877877  
    878878              ! compute temperature, salinity, insitu & potential density, ssh and depth at U/V point  
  • trunk/NEMOGCM/TOOLS/SECTIONS_DIADCT/src/compute_sections.f90

    r3632 r8126  
    681681     IF( sec%nb_point .ne. 0 )THEN 
    682682        IF (  sec%listPoint(sec%nb_point)%I .NE.  sec%listPoint(1)%I ) THEN 
    683            sec%slopeSection = ( sec%listPoint(sec%nb_point)%J - sec%listPoint(1)%J ) /  & 
    684                               ( sec%listPoint(sec%nb_point)%I - sec%listPoint(1)%I )       
     683           sec%slopeSection = REAL( ( sec%listPoint(sec%nb_point)%J - sec%listPoint(1)%J ) , wp )/  & 
     684                              REAL( ( sec%listPoint(sec%nb_point)%I - sec%listPoint(1)%I ) , wp )      
    685685        ELSE 
    686686           sec%slopeSection = 10000._wp 
Note: See TracChangeset for help on using the changeset viewer.