Changeset 8064


Ignore:
Timestamp:
2017-05-24T15:46:15+02:00 (3 years ago)
Author:
jwhile
Message:

Minor update to field_def and sbc_ice

Location:
branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/CONFIG/SHARED/field_def.xml

    r7747 r8064  
    2626         <field id="e3t_0"        long_name="Initial T-cell thickness"   standard_name="ref_cell_thickness"   unit="m"   grid_ref="grid_T_3D"/> 
    2727 
     28         <field id="tinsitu"      long_name="in situ temperature" standard_name="in_situ_temperature"   unit="degC"     grid_ref="grid_T_3D"/> 
     29         <field id="sinsitu"      long_name="in situ salinity" standard_name="in_situ_salinity"   unit="1e-3"     grid_ref="grid_T_3D"/> 
     30          
    2831         <field id="toce"         long_name="Sea Water Potential Temperature"         standard_name="sea_water_potential_temperature"   unit="degree_C"     grid_ref="grid_T_3D"/> 
    2932         <field id="toce_e3t"     long_name="temperature * e3t"                                                     unit="degree_C*m"   grid_ref="grid_T_3D" > toce * e3t </field > 
  • branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90

    r8037 r8064  
    8989 
    9090#if defined key_cice 
    91    ! 
    92    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   ndaice_da          !: NEMO fresh water flux to ocean due to data assim 
    93    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   nfresh_da          !: NEMO salt flux to ocean due to data assim 
    94    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   nfsalt_da          !: NEMO ice concentration change/second from data assim 
    9591   ! 
    9692   ! for consistency with LIM, these are declared with three dimensions 
     
    172168                wndi_ice(jpi,jpj)     , tatm_ice(jpi,jpj)     , qatm_ice(jpi,jpj)     , & 
    173169                wndj_ice(jpi,jpj)     , nfrzmlt(jpi,jpj)      , ss_iou(jpi,jpj)       , & 
    174                 ndaice_da(jpi,jpj)    , nfresh_da(jpi,jpj)    , nfsalt_da(jpi,jpj)    , & 
    175170                ss_iov(jpi,jpj)       , fr_iu(jpi,jpj)        , fr_iv(jpi,jpj)        , & 
    176171                a_i(jpi,jpj,ncat)     , topmelt(jpi,jpj,ncat) , botmelt(jpi,jpj,ncat) , & 
    177172                ndaice_da(jpi,jpj)    , nfresh_da(jpi,jpj)    , nfsalt_da(jpi,jpj)    , & 
    178                 STAT= ierr(1) ) 
    179173                sstfrz(jpi,jpj)       , STAT= ierr(1) ) 
    180174   ! Alex West: Allocating tn_ice with 5 categories.  When NEMO is used with CICE, this variable 
Note: See TracChangeset for help on using the changeset viewer.