Changeset 6083 for branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2015-12-17T12:48:50+01:00 (9 years ago)

Author:

cbricaud

Message:

modifications from Mercator merge ( dev_5974_MERCATOR10_LIMINI ) and fix compilation bugs

Location:

branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC

Files:

• ICB/icbrst.F90 (modified) (2 diffs)
• OBS/diaobs.F90 (modified) (1 diff)

branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90

@@ -94 +94 @@
            &     ij .GE. nldj+njmpp-1 .AND. ij .LE. nlej+njmpp-1 ) THEN           
 
-               CALL iom_get( ncid, jpdom_unknown, 'number'       , (/zdata(:)/) , ktime=jn, kstart=(/1/), kcount=(/nkounts/) )
+               CALL iom_get( ncid, jpdom_unknown, 'number'       , zdata(:) , ktime=jn, kstart=(/1/), kcount=(/nkounts/) )
                localberg%number(:) = INT(zdata(:))
                CALL iom_get( ncid, 'mass_scaling' , localberg%mass_scaling, ktime=jn )
@@ -126 +126 @@
       CALL iom_get( ncid, jpdom_autoglo_xy, 'stored_ice'  , berg_grid%stored_ice, kstart=(/1,1,1/), kcount=(/1,1,nclasses/) )
       
-      CALL iom_get( ncid, jpdom_unknown, 'kount' , (/zdata(:)/) )
+      CALL iom_get( ncid, jpdom_unknown, 'kount' , zdata(:) )
       num_bergs(:) = INT(zdata(:))
 

branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -863 +863 @@
       INTEGER :: imin
       INTEGER :: imday       ! Number of days in month.
-      INTEGER, DIMENSION(12) :: &
-         &       imonth_len  ! Length in days of the months of the current year
       REAL(wp) :: zdayfrc    ! Fraction of day