Changeset 9881


Ignore:
Timestamp:
2018-07-05T17:43:55+02:00 (2 years ago)
Author:
jamrae
Message:

Various changes to allow UKMO coupled configuration to compile with LIM3 turned on and CICE turned off.

Location:
branches/UKMO/dev_merge_2017_CICE_interface_SI3_JGLR/NEMOGCM/NEMO
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_merge_2017_CICE_interface_SI3_JGLR/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90

    r9499 r9881  
    2121   USE dom_oce        ! ocean domain 
    2222   USE sbc_oce , ONLY : sst_m, sss_m, ln_ice_embd  
    23    USE sbc_ice , ONLY : tn_ice, snwice_mass, snwice_mass_b 
     23   USE sbc_ice , ONLY : snwice_mass, snwice_mass_b 
    2424   USE eosbn2         ! equation of state 
    2525   USE domvvl         ! Variable volume 
     
    353353         END DO 
    354354         ! 
    355          tn_ice (:,:,:) = t_su (:,:,:) 
    356355         t1_ice (:,:,:) = t_i (:,:,1,:)   ! initialisation of 1st layer temp for coupled simu 
    357356 
     
    390389         END DO 
    391390 
    392          tn_ice (:,:,:) = t_i (:,:,1,:) 
    393391         t1_ice (:,:,:) = t_i (:,:,1,:)   ! initialisation of 1st layer temp for coupled simu 
    394392          
  • branches/UKMO/dev_merge_2017_CICE_interface_SI3_JGLR/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90

    r9499 r9881  
    257257      ! 
    258258      fr_i  (:,:)   = at_i(:,:)        ! initialisation of sea-ice fraction 
    259       tn_ice(:,:,:) = t_su(:,:,:)      ! initialisation of surface temp for coupled simu 
     259      t1_ice(:,:,:) = t_su(:,:,:)      ! initialisation of surface temp for coupled simu 
    260260      ! 
    261261      !                                ! set max concentration in both hemispheres 
  • branches/UKMO/dev_merge_2017_CICE_interface_SI3_JGLR/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90

    r9499 r9881  
    8989      !!              - sfx     : salt flux  
    9090      !!              - fr_i    : ice fraction 
    91       !!              - tn_ice  : sea-ice surface temperature 
     91      !!              - t1_ice  : sea-ice surface temperature 
    9292      !!              - alb_ice : sea-ice albedo (recomputed only for coupled mode) 
    9393      !! 
     
    190190      !---------------------------------- 
    191191      fr_i  (:,:)   = at_i(:,:)             ! Sea-ice fraction             
    192       tn_ice(:,:,:) = t_su(:,:,:)           ! Ice surface temperature                       
     192      t1_ice(:,:,:) = t_su(:,:,:)           ! Ice surface temperature                       
    193193 
    194194      ! Snow/ice albedo (only if sent to coupler, useless in forced mode) 
  • branches/UKMO/dev_merge_2017_CICE_interface_SI3_JGLR/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90

    r9819 r9881  
    5050   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   zevap_ice        !: latent flux over ice                          [W/m2] 
    5151   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   dqla_ice       !: latent sensibility over ice                 [W/m2/K] 
     52   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   qla_ice        !:  latent heat flux over ice                  [W/m2/K] 
    5253   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   dqns_ice       !: non solar heat flux over ice (LW+SEN+LA)    [W/m2/K] 
     54#if ! defined  key_lim3 
    5355   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   t1_ice         !: ice surface temperature                          [K] 
     56# endif 
    5457   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   alb_ice        !: ice albedo                                       [-] 
    5558 
     
    194197   INTEGER         , PUBLIC, PARAMETER ::   jpl = 1  
    195198   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   u_ice, v_ice                        ! jpi, jpj 
    196    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   t1_ice, alb_ice, qns_ice, dqns_ice  ! (jpi,jpj,jpl) 
     199#if ! defined  key_lim3 
     200   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   t1_ice 
     201#endif 
     202   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   alb_ice, qns_ice, dqns_ice  ! (jpi,jpj,jpl) 
     203 
    197204   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   a_i 
    198205   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   emp_ice 
  • branches/UKMO/dev_merge_2017_CICE_interface_SI3_JGLR/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90

    r9499 r9881  
    4040   USE fldread        ! read input fields 
    4141   USE sbc_oce        ! Surface boundary condition: ocean fields 
    42    USE cyclone        ! Cyclone 10m wind form trac of cyclone centres 
    4342   USE sbcdcy         ! surface boundary condition: diurnal cycle 
    4443   USE sbcwave , ONLY :   cdn_wave ! wave module 
Note: See TracChangeset for help on using the changeset viewer.