Changeset 8064

Timestamp:

2017-05-24T15:46:15+02:00 (7 years ago)

Author:

jwhile

Message:

Minor update to field_def and sbc_ice

Location:

branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM

Files:

• CONFIG/SHARED/field_def.xml (modified) (1 diff)
• NEMO/OPA_SRC/SBC/sbc_ice.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -26 +26 @@
          <field id="e3t_0"        long_name="Initial T-cell thickness"   standard_name="ref_cell_thickness"   unit="m"   grid_ref="grid_T_3D"/>
 
+         <field id="tinsitu"      long_name="in situ temperature" standard_name="in_situ_temperature"   unit="degC"     grid_ref="grid_T_3D"/>
+         <field id="sinsitu"      long_name="in situ salinity" standard_name="in_situ_salinity"   unit="1e-3"     grid_ref="grid_T_3D"/>
+         
          <field id="toce"         long_name="Sea Water Potential Temperature"         standard_name="sea_water_potential_temperature"   unit="degree_C"     grid_ref="grid_T_3D"/>
          <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

@@ -89 +89 @@
 
 #if defined key_cice
-   !
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   ndaice_da          !: NEMO fresh water flux to ocean due to data assim
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   nfresh_da          !: NEMO salt flux to ocean due to data assim
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   nfsalt_da          !: NEMO ice concentration change/second from data assim
    !
    ! for consistency with LIM, these are declared with three dimensions
@@ -172 +168 @@
                 wndi_ice(jpi,jpj)     , tatm_ice(jpi,jpj)     , qatm_ice(jpi,jpj)     , &
                 wndj_ice(jpi,jpj)     , nfrzmlt(jpi,jpj)      , ss_iou(jpi,jpj)       , &
-                ndaice_da(jpi,jpj)    , nfresh_da(jpi,jpj)    , nfsalt_da(jpi,jpj)    , &
                 ss_iov(jpi,jpj)       , fr_iu(jpi,jpj)        , fr_iv(jpi,jpj)        , &
                 a_i(jpi,jpj,ncat)     , topmelt(jpi,jpj,ncat) , botmelt(jpi,jpj,ncat) , &
                 ndaice_da(jpi,jpj)    , nfresh_da(jpi,jpj)    , nfsalt_da(jpi,jpj)    , &
-                STAT= ierr(1) )
                 sstfrz(jpi,jpj)       , STAT= ierr(1) )
    ! Alex West: Allocating tn_ice with 5 categories.  When NEMO is used with CICE, this variable