Changeset 9430


Ignore:
Timestamp:
2018-03-26T16:47:20+02:00 (2 years ago)
Author:
nicolasmartin
Message:

Bugfix on trunk for key_floats compilation fix #2069

Location:
trunk/NEMOGCM/NEMO
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

    r8698 r9430  
    191191 
    192192# if defined key_floats 
    193       CALL iom_set_axis_attr( "nfloat", (/ (REAL(ji,wp), ji=1,nfloat) /) ) 
     193      CALL iom_set_axis_attr( "nfloat", (/ (REAL(ji,wp), ji=1, jpnfl) /) ) 
    194194# endif 
    195195#if defined key_lim3 || defined key_lim2 
  • trunk/NEMOGCM/NEMO/TOP_SRC/AGE/trcnam_age.F90

    r7124 r9430  
    6161         WRITE(numout,*) ' trc_nam_age: Read namage, namelist for Age passive tracer' 
    6262         WRITE(numout,*) ' ~~~~~~~' 
    63          WRITE(numout,*) '  depth over which age tracer reset to zero                              rn_age_depth      = ', rn_age_depth  
    64          WRITE(numout,*) '  recip of relax. timescale (s) for age tracer shallower than age_depth  rn_age_kill_rate  = ', rn_age_kill_rate  
     63         WRITE(numout,*) & 
     64            & '  depth over which age tracer reset to zero                               rn_age_depth      = ', rn_age_depth 
     65         WRITE(numout,*) & 
     66            &  '  recip of relax. timescale (s) for age tracer shallower than age_depth  rn_age_kill_rate  = ', rn_age_kill_rate 
    6567         WRITE(numout,*) '' 
    6668      ENDIF 
  • trunk/NEMOGCM/NEMO/TOP_SRC/trcbc.F90

    r7646 r9430  
    198198         WRITE(numout,'(2a)') '   COASTAL BC data repository : ', TRIM(cn_dir_cbc) 
    199199         IF( .NOT.ln_rnf .OR. .NOT.ln_linssh ) ln_rnf_ctl = .FALSE. 
    200          IF( ln_rnf_ctl )  WRITE(numout,'(a)') ' -> Remove runoff dilution effect on tracers with absent river load (ln_rnf_ctl = .TRUE.)'  
     200         IF( ln_rnf_ctl )  WRITE(numout,'(a)') & 
     201            & ' -> Remove runoff dilution effect on tracers with absent river load (ln_rnf_ctl = .TRUE.)' 
    201202         WRITE(numout,*) ' ' 
    202203         WRITE(numout,'(a,i3)') '   Total tracers to be initialized with OPEN BCs data:', nb_trcobc 
     
    205206            WRITE(numout,*) '   #trc        NAME        Boundary     Mult.Fact.   OBC Settings' 
    206207            DO jn = 1, ntrc 
    207                IF( ln_trc_obc(jn) )  WRITE(numout, 9001) jn, TRIM( sn_trcobc(jn)%clvar ), 'OBC', rn_trofac(jn), (trcdta_bdy(jn,ib)%cn_obc,ib=1,nb_bdy) 
    208                IF( .NOT. ln_trc_obc(jn) )  WRITE(numout, 9002) jn, 'Set data to IC and use default condition', (trcdta_bdy(jn,ib)%cn_obc,ib=1,nb_bdy) 
     208               IF( ln_trc_obc(jn) )  WRITE(numout, 9001) & 
     209                  & jn, TRIM( sn_trcobc(jn)%clvar ), 'OBC', rn_trofac(jn), (trcdta_bdy(jn,ib)%cn_obc,ib=1,nb_bdy) 
     210               IF( .NOT. ln_trc_obc(jn) )  WRITE(numout, 9002) & 
     211                  & jn, 'Set data to IC and use default condition', (trcdta_bdy(jn,ib)%cn_obc,ib=1,nb_bdy) 
    209212            ENDDO 
    210213            WRITE(numout,*) ' ' 
    211214            DO ib = 1, nb_bdy 
    212                 IF(nn_trcdmp_bdy(ib) .EQ. 0) WRITE(numout,9003) '   Boundary ',ib,' -> NO damping of tracers' 
    213                 IF(nn_trcdmp_bdy(ib) .EQ. 1) WRITE(numout,9003) '   Boundary ',ib,' -> damping ONLY for tracers with external data provided' 
    214                 IF(nn_trcdmp_bdy(ib) .EQ. 2) WRITE(numout,9003) '   Boundary ',ib,' -> damping of ALL tracers' 
     215                IF(nn_trcdmp_bdy(ib) .EQ. 0) WRITE(numout,9003) & 
     216                  & '   Boundary ',ib,' -> NO damping of tracers' 
     217                IF(nn_trcdmp_bdy(ib) .EQ. 1) WRITE(numout,9003) & 
     218                  & '   Boundary ',ib,' -> damping ONLY for tracers with external data provided' 
     219                IF(nn_trcdmp_bdy(ib) .EQ. 2) WRITE(numout,9003) & 
     220                  & '   Boundary ',ib,' -> damping of ALL tracers' 
    215221                IF(nn_trcdmp_bdy(ib) .GT. 0) THEN 
    216222                   WRITE(numout,9003) '     USE damping parameters from nambdy for boundary ', ib,' : ' 
Note: See TracChangeset for help on using the changeset viewer.