Changeset 9842

Timestamp:

2018-06-26T11:40:32+02:00 (6 years ago)

Author:

frrh

Message:

Merge JW's IFORT changes from
​http://fcm3/projects/NEMO.xm/log/branches/UKMO/dev_r5518_NIWA-ifort-syntax-fix?rev=9834

Location:

branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/TOP_SRC

Files:

• MEDUSA/bio_medusa_update.F90 (modified) (1 diff)
• MEDUSA/trcbio_medusa.F90 (modified) (1 diff)
• trcrst.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90

@@ -267 +267 @@
                              ! mort. loss
                          ((1.0 - xfdfrac1) * fdpds(ji,jj)) +                 &
-                             &  ! egestion of grazed Si
+                             ! egestion of grazed Si
                          ((1.0 - xfdfrac3) * fgmepds(ji,jj)) +               &
                              ! fast diss. and metab. losses

branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90

@@ -798 +798 @@
       !! temporary variables
       REAL(wp), INTENT( in ), DIMENSION(3,3) :: tiny_var, tiny_mask
-      CHARACTER(25), INTENT( in )            :: var_nm
+      CHARACTER(3), INTENT( in )            :: var_nm
       REAL(wp), INTENT( in )                 :: mini, maxi
       REAL(wp), INTENT( out )                :: varout
       REAL(wp)      :: sumtsn, tsnavg
       INTEGER       :: summask
-      CHARACTER(25) :: charout1, charout2
+      CHARACTER(3) :: charout1, charout2
       CHARACTER(60) :: charout3, charout4
       INTEGER       :: ii,ij

branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -726 +726 @@
       !!----------------------------------------------------------------------
       INTEGER  :: ji, jj, jk, jn
-      REAL(wp) :: zsum3d, zsum2d, zinvt, zdelta, zratio, loc_vol, loc_are
+      REAL(wp) :: zsum3d, zsum2d, zinvt, zdelta, zratio, loc_are
       REAL(wp) :: zq1, zq2, loc_vol, loc_area
       REAL(wp), DIMENSION(jpi,jpj,jpk) :: z3d, zvol