Changeset 6020 for branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90

Timestamp:

2015-12-08T12:39:53+01:00 (8 years ago)

Author:

timgraham

Message:

Merged with head of trunk

File:

• branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90 (modified) (1 diff)

branches/UKMO/icebergs_restart_single_file/NEMOGCM/NEMO/LIM_SRC_2/limdmp_2.F90

@@ -71 +71 @@
          CALL fld_read( kt, nn_fsbc, sf_icedmp )
          !
-!CDIR COLLAPSE
          hicif(:,:) = MAX( 0._wp,                     &        ! h >= 0         avoid spurious out of physical range
             &         hicif(:,:) - rdt_ice * resto_ice(:,:,1) * ( hicif(:,:) - sf_icedmp(jp_hicif)%fnow(:,:,1) )  ) 
-!CDIR COLLAPSE
          frld (:,:) = MAX( 0._wp, MIN( 1._wp,         &        ! 0<= frld<=1    values which blow the run up
             &         frld (:,:) - rdt_ice * resto_ice(:,:,1) * ( frld (:,:) - sf_icedmp(jp_frld )%fnow(:,:,1) )  )  )