Changeset 6358 for branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90

Timestamp:

2016-03-07T12:34:27+01:00 (8 years ago)

Author:

dancopsey

Message:

Reverse last merge (I did it wrong)

File:

• branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90 (modified) (4 diffs, 1 prop)

branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bc/NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90

@@ -25 +25 @@
    USE icbutl         ! iceberg utility routines
 
-   USE sbc_oce        ! for icesheet freshwater input variables
-   USE in_out_manager
-   USE iom
-
    IMPLICIT NONE
    PRIVATE
@@ -37 +33 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2011)
-   !! $Id: icbclv.F90 5215 2015-04-15 16:11:56Z nicolasmartin $
+   !! $Id$
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -52 +48 @@
       !
       REAL(wp)                        :: zcalving_used, zdist, zfact
-      REAL(wp)                        :: zgreenland_calving_sum, zantarctica_calving_sum
       INTEGER                         :: jn, ji, jj                    ! loop counters
       INTEGER                         :: imx                           ! temporary integer for max berg class
@@ -64 +59 @@
       zfact = ( (1000._wp)**3 / ( NINT(rday) * nyear_len(1) ) ) * 850._wp
       berg_grid%calving(:,:) = src_calving(:,:) * tmask_i(:,:) * zfact
-
-      IF( lk_oasis) THEN
-      ! ln_coupled_iceshelf_fluxes uninitialised unless lk_oasis=true
-      IF( ln_coupled_iceshelf_fluxes ) THEN
-
-        ! Adjust total calving rates so that sum of iceberg calving and iceshelf melting in the northern
-        ! and southern hemispheres equals rate of increase of mass of greenland and antarctic ice sheets
-        ! to preserve total freshwater conservation in coupled models without an active ice sheet model.
-
-         zgreenland_calving_sum = SUM( berg_grid%calving(:,:) * greenland_icesheet_mask(:,:) )
-         IF( lk_mpp ) CALL mpp_sum( zgreenland_calving_sum )
-         WHERE( greenland_icesheet_mask(:,:) == 1.0 )                                                                                 &
-        &    berg_grid%calving(:,:) = berg_grid%calving(:,:) * greenland_icesheet_mass_rate_of_change * rn_greenland_calving_fraction &
-        &                                     / ( zgreenland_calving_sum + 1.0e-10_wp )
-
-         ! check
-         IF(lwp) WRITE(numout, *) 'Greenland iceberg calving climatology (kg/s) : ',zgreenland_calving_sum
-         zgreenland_calving_sum = SUM( berg_grid%calving(:,:) * greenland_icesheet_mask(:,:) )
-         IF( lk_mpp ) CALL mpp_sum( zgreenland_calving_sum )
-         IF(lwp) WRITE(numout, *) 'Greenland iceberg calving adjusted value (kg/s) : ',zgreenland_calving_sum
-
-         zantarctica_calving_sum = SUM( berg_grid%calving(:,:) * antarctica_icesheet_mask(:,:) )
-         IF( lk_mpp ) CALL mpp_sum( zantarctica_calving_sum )
-         WHERE( antarctica_icesheet_mask(:,:) == 1.0 )                                                                              &
-         berg_grid%calving(:,:) = berg_grid%calving(:,:) * antarctica_icesheet_mass_rate_of_change * rn_antarctica_calving_fraction &
-        &                           / ( zantarctica_calving_sum + 1.0e-10_wp )
- 
-         ! check
-         IF(lwp) WRITE(numout, *) 'Antarctica iceberg calving climatology (kg/s) : ',zantarctica_calving_sum
-         zantarctica_calving_sum = SUM( berg_grid%calving(:,:) * antarctica_icesheet_mask(:,:) )
-         IF( lk_mpp ) CALL mpp_sum( zantarctica_calving_sum )
-         IF(lwp) WRITE(numout, *) 'Antarctica iceberg calving adjusted value (kg/s) : ',zantarctica_calving_sum
-
-      ENDIF
-      ENDIF
-   
-      CALL iom_put( 'berg_calve', berg_grid%calving(:,:) )
 
       ! Heat in units of W/m2, and mask (just in case)