Changeset 7928

Timestamp:

2017-04-19T10:07:07+02:00 (7 years ago)

Author:

davestorkey

Message:

UKMO/dev_r5518_GO6_package_landice_fw_input_option2 branch: change parameter names.

Location:

branches/UKMO/dev_r5518_GO6_package_landice_fw_input_option2/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbc_oce.F90 (modified) (1 diff)
• sbccpl.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_GO6_package_landice_fw_input_option2/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90

@@ -161 +161 @@
    LOGICAL, PUBLIC     ::   ln_iceshelf_init_atmos         ! If true force ocean to initialise iceshelf masses from atmospheric values rather
                                                            ! than values in ocean restart (applicable if nn_coupled_iceshelf_fluxes=1).
-   REAL(wp), PUBLIC    ::   rn_greenland_total_fw_input    ! Constant total rate of freshwater input (kg/s) for Greenland (if nn_coupled_iceshelf_fluxes=2) 
+   REAL(wp), PUBLIC    ::   rn_greenland_total_fw_flux    ! Constant total rate of freshwater input (kg/s) for Greenland (if nn_coupled_iceshelf_fluxes=2) 
    REAL(wp), PUBLIC    ::   rn_greenland_calving_fraction  ! Set fraction of total freshwater flux for iceberg calving - remainder goes to iceshelf melting.
-   REAL(wp), PUBLIC    ::   rn_antarctica_total_fw_input   ! Constant total rate of freshwater input (kg/s) for Antarctica (if nn_coupled_iceshelf_fluxes=2) 
+   REAL(wp), PUBLIC    ::   rn_antarctica_total_fw_flux   ! Constant total rate of freshwater input (kg/s) for Antarctica (if nn_coupled_iceshelf_fluxes=2) 
    REAL(wp), PUBLIC    ::   rn_antarctica_calving_fraction ! Set fraction of total freshwater flux for iceberg calving - remainder goes to iceshelf melting.
    REAL(wp), PUBLIC    ::   rn_iceshelf_fluxes_tolerance   ! Absolute tolerance for detecting differences in icesheet masses. 

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

@@ -241 +241 @@
          &                  sn_rcv_co2 , sn_rcv_grnm  , sn_rcv_antm  , sn_rcv_ts_ice, nn_cplmodel  ,  &
          &                  ln_usecplmask, nn_coupled_iceshelf_fluxes, ln_iceshelf_init_atmos,        &
-         &                  rn_greenland_total_fw_input, rn_greenland_calving_fraction, &
-         &                  rn_antarctica_total_fw_input, rn_antarctica_calving_fraction, rn_iceshelf_fluxes_tolerance
+         &                  rn_greenland_total_fw_flux, rn_greenland_calving_fraction, &
+         &                  rn_antarctica_total_fw_flux, rn_antarctica_calving_fraction, rn_iceshelf_fluxes_tolerance
       !!---------------------------------------------------------------------
 
@@ -313 +313 @@
          WRITE(numout,*)'  nn_coupled_iceshelf_fluxes          = ', nn_coupled_iceshelf_fluxes
          WRITE(numout,*)'  ln_iceshelf_init_atmos              = ', ln_iceshelf_init_atmos
-         WRITE(numout,*)'  rn_greenland_total_fw_input         = ', rn_greenland_total_fw_input
-         WRITE(numout,*)'  rn_antarctica_total_fw_input        = ', rn_antarctica_total_fw_input
+         WRITE(numout,*)'  rn_greenland_total_fw_flux         = ', rn_greenland_total_fw_flux
+         WRITE(numout,*)'  rn_antarctica_total_fw_flux        = ', rn_antarctica_total_fw_flux
          WRITE(numout,*)'  rn_greenland_calving_fraction       = ', rn_greenland_calving_fraction
          WRITE(numout,*)'  rn_antarctica_calving_fraction      = ', rn_antarctica_calving_fraction
@@ -1378 +1378 @@
          IF(lwp) WRITE(numout,*) 'Greenland icesheet seconds lapsed since last change is ', greenland_icesheet_timelapsed
       ELSE IF ( nn_coupled_iceshelf_fluxes == 2 ) THEN
-         greenland_icesheet_mass_rate_of_change = rn_greenland_total_fw_input
+         greenland_icesheet_mass_rate_of_change = rn_greenland_total_fw_flux
       ENDIF
 
@@ -1415 +1415 @@
          IF(lwp) WRITE(numout,*) 'Antarctica icesheet seconds lapsed since last change is ', antarctica_icesheet_timelapsed
       ELSE IF ( nn_coupled_iceshelf_fluxes == 2 ) THEN
-         antarctica_icesheet_mass_rate_of_change = rn_antarctica_total_fw_input
+         antarctica_icesheet_mass_rate_of_change = rn_antarctica_total_fw_flux
       ENDIF