Changeset 9430

Timestamp:

2018-03-26T16:47:20+02:00 (6 years ago)

Author:

nicolasmartin

Message:

Bugfix on trunk for key_floats compilation fix #2069

Location:

trunk/NEMOGCM/NEMO

Files:

• OPA_SRC/IOM/iom.F90 (modified) (1 diff)
• TOP_SRC/AGE/trcnam_age.F90 (modified) (1 diff)
• TOP_SRC/trcbc.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -191 +191 @@
 
 # if defined key_floats
-      CALL iom_set_axis_attr( "nfloat", (/ (REAL(ji,wp), ji=1,nfloat) /) )
+      CALL iom_set_axis_attr( "nfloat", (/ (REAL(ji,wp), ji=1, jpnfl) /) )
 # endif
 #if defined key_lim3 || defined key_lim2

trunk/NEMOGCM/NEMO/TOP_SRC/AGE/trcnam_age.F90

@@ -61 +61 @@
          WRITE(numout,*) ' trc_nam_age: Read namage, namelist for Age passive tracer'
          WRITE(numout,*) ' ~~~~~~~'
-         WRITE(numout,*) '  depth over which age tracer reset to zero                              rn_age_depth      = ', rn_age_depth 
-         WRITE(numout,*) '  recip of relax. timescale (s) for age tracer shallower than age_depth  rn_age_kill_rate  = ', rn_age_kill_rate 
+         WRITE(numout,*) &
+            & '  depth over which age tracer reset to zero                               rn_age_depth      = ', rn_age_depth
+         WRITE(numout,*) &
+            &  '  recip of relax. timescale (s) for age tracer shallower than age_depth  rn_age_kill_rate  = ', rn_age_kill_rate
          WRITE(numout,*) ''
       ENDIF

trunk/NEMOGCM/NEMO/TOP_SRC/trcbc.F90

@@ -198 +198 @@
          WRITE(numout,'(2a)') '   COASTAL BC data repository : ', TRIM(cn_dir_cbc)
          IF( .NOT.ln_rnf .OR. .NOT.ln_linssh ) ln_rnf_ctl = .FALSE.
-         IF( ln_rnf_ctl )  WRITE(numout,'(a)') ' -> Remove runoff dilution effect on tracers with absent river load (ln_rnf_ctl = .TRUE.)' 
+         IF( ln_rnf_ctl )  WRITE(numout,'(a)') &
+            & ' -> Remove runoff dilution effect on tracers with absent river load (ln_rnf_ctl = .TRUE.)'
          WRITE(numout,*) ' '
          WRITE(numout,'(a,i3)') '   Total tracers to be initialized with OPEN BCs data:', nb_trcobc
@@ -205 +206 @@
             WRITE(numout,*) '   #trc        NAME        Boundary     Mult.Fact.   OBC Settings'
             DO jn = 1, ntrc
-               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)
-               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)
+               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)
+               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)
             ENDDO
             WRITE(numout,*) ' '
             DO ib = 1, nb_bdy
-                IF(nn_trcdmp_bdy(ib) .EQ. 0) WRITE(numout,9003) '   Boundary ',ib,' -> NO damping of tracers'
-                IF(nn_trcdmp_bdy(ib) .EQ. 1) WRITE(numout,9003) '   Boundary ',ib,' -> damping ONLY for tracers with external data provided'
-                IF(nn_trcdmp_bdy(ib) .EQ. 2) WRITE(numout,9003) '   Boundary ',ib,' -> damping of ALL tracers'
+                IF(nn_trcdmp_bdy(ib) .EQ. 0) WRITE(numout,9003) &
+                  & '   Boundary ',ib,' -> NO damping of tracers'
+                IF(nn_trcdmp_bdy(ib) .EQ. 1) WRITE(numout,9003) &
+                  & '   Boundary ',ib,' -> damping ONLY for tracers with external data provided'
+                IF(nn_trcdmp_bdy(ib) .EQ. 2) WRITE(numout,9003) &
+                  & '   Boundary ',ib,' -> damping of ALL tracers'
                 IF(nn_trcdmp_bdy(ib) .GT. 0) THEN
                    WRITE(numout,9003) '     USE damping parameters from nambdy for boundary ', ib,' : '