Changeset 11000

Timestamp:

2019-05-20T13:20:40+02:00 (6 years ago)

Author:

dancopsey

Message:

Relabel name of the switch that turns on the fix.

Location:

branches/UKMO/dev_r5518_GO6_fix_zemp_ice/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbccpl.F90 (modified) (5 diffs)
• sbcice_cice.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_fix_zemp_ice/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -184 +184 @@
    LOGICAL     ::   ln_usecplmask          !  use a coupling mask file to merge data received from several models
                                            !   -> file cplmask.nc with the float variable called cplmask (jpi,jpj,nn_cplmodel)
-   LOGICAL, PUBLIC ::   ln_fix_sublimation_botmelt     ! Apply sublimation bug fixes (GMED#449)
+   LOGICAL, PUBLIC ::   ln_fix_sea_ice_fluxes     ! Apply sea ice flux bug fixes (GMED#449)
 
    TYPE ::   DYNARR     
@@ -262 +262 @@
          &                  rn_greenland_total_fw_flux, rn_greenland_calving_fraction, &
          &                  rn_antarctica_total_fw_flux, rn_antarctica_calving_fraction, rn_iceshelf_fluxes_tolerance, &
-         &                  ln_fix_sublimation_botmelt
+         &                  ln_fix_sea_ice_fluxes
       !!---------------------------------------------------------------------
 
@@ -332 +332 @@
          WRITE(numout,*)'  nn_cplmodel                         = ', nn_cplmodel
          WRITE(numout,*)'  ln_usecplmask                       = ', ln_usecplmask
-         WRITE(numout,*)'  ln_fix_sublimation_botmelt          = ', ln_fix_sublimation_botmelt
+         WRITE(numout,*)'  ln_fix_sea_ice_fluxes               = ', ln_fix_sea_ice_fluxes
          WRITE(numout,*)'  nn_coupled_iceshelf_fluxes          = ', nn_coupled_iceshelf_fluxes
          WRITE(numout,*)'  ln_iceshelf_init_atmos              = ', ln_iceshelf_init_atmos
@@ -1774 +1774 @@
          IF ( TRIM(sn_rcv_emp%clcat) == 'yes' ) THEN
             ! zemp_ice is the sum of frcv(jpr_ievp)%z3(:,:,1) over all layers - snow
-            IF ( ln_fix_sublimation_botmelt ) THEN
+            IF ( ln_fix_sea_ice_fluxes ) THEN
                zemp_ice(:,:) = - frcv(jpr_snow)%z3(:,:,1) * zicefr(:,:)
             ELSE
@@ -1780 +1780 @@
             ENDIF
             DO jl=1,jpl
-               IF ( ln_fix_sublimation_botmelt ) THEN
+               IF ( ln_fix_sea_ice_fluxes ) THEN
                   zemp_ice(:,:   ) = zemp_ice(:,:) + frcv(jpr_ievp)%z3(:,:,jl) * a_i_last_couple(:,:,jl)
                ELSE

branches/UKMO/dev_r5518_GO6_fix_zemp_ice/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

@@ -395 +395 @@
          ELSE IF (ksbc == jp_purecpl) THEN
             DO jl=1,ncat
-               IF ( ln_fix_sublimation_botmelt ) THEN
+               IF ( ln_fix_sea_ice_fluxes ) THEN
                   ztmpn(:,:,jl)=qla_ice(:,:,jl)*a_i_last_couple(:,:,jl)
                ELSE
@@ -412 +412 @@
 !  Convert to GBM
             IF (ksbc == jp_flx .OR. ksbc == jp_purecpl) THEN
-               IF ( ln_fix_sublimation_botmelt ) THEN
+               IF ( ln_fix_sea_ice_fluxes ) THEN
                   ztmp(:,:) = botmelt(:,:,jl)*a_i_last_couple(:,:,jl)
                ELSE
@@ -425 +425 @@
 !  Convert to GBM
             IF (ksbc == jp_flx .OR. ksbc == jp_purecpl) THEN
-               IF ( ln_fix_sublimation_botmelt ) THEN
+               IF ( ln_fix_sea_ice_fluxes ) THEN
                   ztmp(:,:) = (topmelt(:,:,jl)+botmelt(:,:,jl))*a_i_last_couple(:,:,jl) 
                ELSE