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

Changeset 9842


Ignore:
Timestamp:
2018-06-26T11:40:32+02:00 (4 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_update.F90

    r9163 r9842  
    267267                             ! mort. loss 
    268268                         ((1.0 - xfdfrac1) * fdpds(ji,jj)) +                 & 
    269                              ! egestion of grazed Si 
     269                             ! egestion of grazed Si 
    270270                         ((1.0 - xfdfrac3) * fgmepds(ji,jj)) +               & 
    271271                             ! fast diss. and metab. losses 
  • branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90

    r9385 r9842  
    798798      !! temporary variables 
    799799      REAL(wp), INTENT( in ), DIMENSION(3,3) :: tiny_var, tiny_mask 
    800       CHARACTER(25), INTENT( in )            :: var_nm 
     800      CHARACTER(3), INTENT( in )            :: var_nm 
    801801      REAL(wp), INTENT( in )                 :: mini, maxi 
    802802      REAL(wp), INTENT( out )                :: varout 
    803803      REAL(wp)      :: sumtsn, tsnavg 
    804804      INTEGER       :: summask 
    805       CHARACTER(25) :: charout1, charout2 
     805      CHARACTER(3) :: charout1, charout2 
    806806      CHARACTER(60) :: charout3, charout4 
    807807      INTEGER       :: ii,ij 
  • branches/UKMO/dev_r5518_NIWA_fix_plus/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

    r9385 r9842  
    726726      !!---------------------------------------------------------------------- 
    727727      INTEGER  :: ji, jj, jk, jn 
    728       REAL(wp) :: zsum3d, zsum2d, zinvt, zdelta, zratio, loc_vol, loc_are 
     728      REAL(wp) :: zsum3d, zsum2d, zinvt, zdelta, zratio, loc_are 
    729729      REAL(wp) :: zq1, zq2, loc_vol, loc_area 
    730730      REAL(wp), DIMENSION(jpi,jpj,jpk) :: z3d, zvol 
Note: See TracChangeset for help on using the changeset viewer.