Changeset 13072


Ignore:
Timestamp:
2020-06-09T11:18:32+02:00 (4 months ago)
Author:
timgraham
Message:

Commit all functional changes

Location:
branches/UKMO/dev_r5518_GO6_package_isfprint/NEMOGCM
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package_isfprint/NEMOGCM/CONFIG/SHARED/namelist_ref

    r11107 r13072  
    10871087   sn_cfctl%l_oceout  = .FALSE. ! that  all areas report. 
    10881088   sn_cfctl%l_layout  = .FALSE. ! 
     1089   sn_cfctl%l_sbcisf  = .FALSE. ! 
    10891090   sn_cfctl%l_mppout  = .FALSE. ! 
    10901091   sn_cfctl%l_mpptop  = .FALSE. ! 
  • branches/UKMO/dev_r5518_GO6_package_isfprint/NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90

    r12233 r13072  
    6969      ! nn_coupled_iceshelf_fluxes uninitialised unless lk_oasis=true 
    7070      IF( nn_coupled_iceshelf_fluxes .gt. 0 ) THEN 
    71         ll_write = ((MOD( kt, sn_cfctl%ptimincr ) == 0) .OR. ( kt == nitend )) .AND. lwp 
     71        ll_write = ((MOD( kt, sn_cfctl%ptimincr ) == 0) .OR. ( kt == nitend )) .AND. lwp .AND. sn_cfctl%l_sbcisf 
    7272        ! Adjust total calving rates so that sum of iceberg calving and iceshelf melting in the northern 
    7373        ! and southern hemispheres equals rate of increase of mass of greenland and antarctic ice sheets 
  • branches/UKMO/dev_r5518_GO6_package_isfprint/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90

    r11101 r13072  
    107107      LOGICAL :: l_trcstat = .FALSE.  !: Produce/do not produce tracer.stat file (T/F) 
    108108      LOGICAL :: l_oceout  = .FALSE.  !: Produce all ocean.outputs    (T) or just one (F) 
     109      LOGICAL :: l_sbcisf  = .FALSE.  !: Print Ice sheet information to ocean.output 
    109110      LOGICAL :: l_layout  = .FALSE.  !: Produce all layout.dat files (T) or just one (F) 
    110111      LOGICAL :: l_mppout  = .FALSE.  !: Produce/do not produce mpp.output_XXXX files (T/F) 
  • branches/UKMO/dev_r5518_GO6_package_isfprint/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r11107 r13072  
    14931493            greenland_icesheet_timelapsed = 0.0_wp        
    14941494         ENDIF 
    1495          IF(lwp .AND. ll_wrtstp) THEN 
     1495         IF(lwp .AND. ll_wrtstp .AND. sn_cfctl%l_sbcisf ) THEN 
    14961496            WRITE(numout,*) 'Greenland icesheet mass (kg) read in is ', zgreenland_icesheet_mass_in 
    14971497            WRITE(numout,*) 'Greenland icesheet mass (kg) used is    ', greenland_icesheet_mass 
     
    15431543            antarctica_icesheet_timelapsed = 0.0_wp        
    15441544         ENDIF 
    1545          IF(lwp .AND. ll_wrtstp) THEN 
     1545         IF(lwp .AND. ll_wrtstp .AND. sn_cfctl%l_sbcisf ) THEN 
    15461546            WRITE(numout,*) 'Antarctica icesheet mass (kg) read in is ', zantarctica_icesheet_mass_in 
    15471547            WRITE(numout,*) 'Antarctica icesheet mass (kg) used is    ', antarctica_icesheet_mass 
  • branches/UKMO/dev_r5518_GO6_package_isfprint/NEMOGCM/NEMO/OPA_SRC/SBC/sbcisf.F90

    r11101 r13072  
    274274 
    275275               ! check 
    276                IF(lwp .AND. ll_wrtstp) WRITE(numout, *) 'Greenland iceshelf melting climatology (kg/s) : ',zgreenland_fwfisf_sum 
     276               IF(lwp .AND. ll_wrtstp .AND. sn_cfctl%l_sbcisf) WRITE(numout, *) 'Greenland iceshelf melting climatology (kg/s) : ',zgreenland_fwfisf_sum 
    277277 
    278278               zgreenland_fwfisf_sum = glob_sum( fwfisf(:,:) * e1t(:,:) * e2t(:,:) * greenland_icesheet_mask(:,:) ) 
    279279 
    280                IF(lwp .AND. ll_wrtstp) WRITE(numout, *) 'Greenland iceshelf melting adjusted value (kg/s) : ',zgreenland_fwfisf_sum 
     280               IF(lwp .AND. ll_wrtstp .AND. sn_cfctl%l_sbcisf) WRITE(numout, *) 'Greenland iceshelf melting adjusted value (kg/s) : ',zgreenland_fwfisf_sum 
    281281 
    282282               zantarctica_fwfisf_sum = glob_sum( fwfisf(:,:) * e1t(:,:) * e2t(:,:) * antarctica_icesheet_mask(:,:) ) 
     
    288288       
    289289               ! check 
    290                IF(lwp .AND. ll_wrtstp) WRITE(numout, *) 'Antarctica iceshelf melting climatology (kg/s) : ',zantarctica_fwfisf_sum 
     290               IF(lwp .AND. ll_wrtstp .AND. sn_cfctl%l_sbcisf) WRITE(numout, *) 'Antarctica iceshelf melting climatology (kg/s) : ',zantarctica_fwfisf_sum 
    291291 
    292292               zantarctica_fwfisf_sum = glob_sum( fwfisf(:,:) * e1t(:,:) * e2t(:,:) * antarctica_icesheet_mask(:,:) ) 
  • branches/UKMO/dev_r5518_GO6_package_isfprint/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r11101 r13072  
    540540         WRITE(numout,*) '                              sn_cfctl%l_trcstat = ', sn_cfctl%l_trcstat 
    541541         WRITE(numout,*) '                              sn_cfctl%l_oceout  = ', sn_cfctl%l_oceout 
     542         WRITE(numout,*) '                              sn_cfctl%l_sbcisf  = ', sn_cfctl%l_sbcisf 
    542543         WRITE(numout,*) '                              sn_cfctl%l_layout  = ', sn_cfctl%l_layout 
    543544         WRITE(numout,*) '                              sn_cfctl%l_mppout  = ', sn_cfctl%l_mppout 
     
    742743         sn_cfctl%l_trcstat = setto 
    743744      ENDIF 
     745      sn_cfctl%l_sbcisf  = setto 
    744746      sn_cfctl%l_oceout  = setto 
    745747      sn_cfctl%l_layout  = setto 
Note: See TracChangeset for help on using the changeset viewer.