Changeset 7928


Ignore:
Timestamp:
2017-04-19T10:07:07+02:00 (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package_landice_fw_input_option2/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_oce.F90

    r7919 r7928  
    161161   LOGICAL, PUBLIC     ::   ln_iceshelf_init_atmos         ! If true force ocean to initialise iceshelf masses from atmospheric values rather 
    162162                                                           ! than values in ocean restart (applicable if nn_coupled_iceshelf_fluxes=1). 
    163    REAL(wp), PUBLIC    ::   rn_greenland_total_fw_input    ! Constant total rate of freshwater input (kg/s) for Greenland (if nn_coupled_iceshelf_fluxes=2)  
     163   REAL(wp), PUBLIC    ::   rn_greenland_total_fw_flux    ! Constant total rate of freshwater input (kg/s) for Greenland (if nn_coupled_iceshelf_fluxes=2)  
    164164   REAL(wp), PUBLIC    ::   rn_greenland_calving_fraction  ! Set fraction of total freshwater flux for iceberg calving - remainder goes to iceshelf melting. 
    165    REAL(wp), PUBLIC    ::   rn_antarctica_total_fw_input   ! Constant total rate of freshwater input (kg/s) for Antarctica (if nn_coupled_iceshelf_fluxes=2)  
     165   REAL(wp), PUBLIC    ::   rn_antarctica_total_fw_flux   ! Constant total rate of freshwater input (kg/s) for Antarctica (if nn_coupled_iceshelf_fluxes=2)  
    166166   REAL(wp), PUBLIC    ::   rn_antarctica_calving_fraction ! Set fraction of total freshwater flux for iceberg calving - remainder goes to iceshelf melting. 
    167167   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

    r7919 r7928  
    241241         &                  sn_rcv_co2 , sn_rcv_grnm  , sn_rcv_antm  , sn_rcv_ts_ice, nn_cplmodel  ,  & 
    242242         &                  ln_usecplmask, nn_coupled_iceshelf_fluxes, ln_iceshelf_init_atmos,        & 
    243          &                  rn_greenland_total_fw_input, rn_greenland_calving_fraction, & 
    244          &                  rn_antarctica_total_fw_input, rn_antarctica_calving_fraction, rn_iceshelf_fluxes_tolerance 
     243         &                  rn_greenland_total_fw_flux, rn_greenland_calving_fraction, & 
     244         &                  rn_antarctica_total_fw_flux, rn_antarctica_calving_fraction, rn_iceshelf_fluxes_tolerance 
    245245      !!--------------------------------------------------------------------- 
    246246 
     
    313313         WRITE(numout,*)'  nn_coupled_iceshelf_fluxes          = ', nn_coupled_iceshelf_fluxes 
    314314         WRITE(numout,*)'  ln_iceshelf_init_atmos              = ', ln_iceshelf_init_atmos 
    315          WRITE(numout,*)'  rn_greenland_total_fw_input         = ', rn_greenland_total_fw_input 
    316          WRITE(numout,*)'  rn_antarctica_total_fw_input        = ', rn_antarctica_total_fw_input 
     315         WRITE(numout,*)'  rn_greenland_total_fw_flux         = ', rn_greenland_total_fw_flux 
     316         WRITE(numout,*)'  rn_antarctica_total_fw_flux        = ', rn_antarctica_total_fw_flux 
    317317         WRITE(numout,*)'  rn_greenland_calving_fraction       = ', rn_greenland_calving_fraction 
    318318         WRITE(numout,*)'  rn_antarctica_calving_fraction      = ', rn_antarctica_calving_fraction 
     
    13781378         IF(lwp) WRITE(numout,*) 'Greenland icesheet seconds lapsed since last change is ', greenland_icesheet_timelapsed 
    13791379      ELSE IF ( nn_coupled_iceshelf_fluxes == 2 ) THEN 
    1380          greenland_icesheet_mass_rate_of_change = rn_greenland_total_fw_input 
     1380         greenland_icesheet_mass_rate_of_change = rn_greenland_total_fw_flux 
    13811381      ENDIF 
    13821382 
     
    14151415         IF(lwp) WRITE(numout,*) 'Antarctica icesheet seconds lapsed since last change is ', antarctica_icesheet_timelapsed 
    14161416      ELSE IF ( nn_coupled_iceshelf_fluxes == 2 ) THEN 
    1417          antarctica_icesheet_mass_rate_of_change = rn_antarctica_total_fw_input 
     1417         antarctica_icesheet_mass_rate_of_change = rn_antarctica_total_fw_flux 
    14181418      ENDIF 
    14191419 
Note: See TracChangeset for help on using the changeset viewer.