Changeset 6774 for branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3

Timestamp:

2016-07-01T20:28:51+02:00 (8 years ago)

Author:

clem

Message:

update from trunk

Location:

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM

Files:

• CONFIG/SHARED/field_def.xml (modified) (1 diff)
• CONFIG/SHARED/namelist_ice_lim3_ref (modified) (1 diff)
• NEMO/OPA_SRC/DYN/dynzdf_imp.F90 (modified) (1 diff)
• NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) (1 diff)

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -303 +303 @@
          <field id="icevolu"      long_name="ice volume"                                                   unit="m"        />
          <field id="snowvol"      long_name="snow volume"                                                  unit="m"        />
-         <field id="tau_icebfr"   long_name="ice friction on ocean bottom for landfast ice"                unit="N"        />
+         <field id="tau_icebfr"   long_name="ice friction on ocean bottom for landfast ice"                unit="N/m2"     />
 
          <field id="icetrp"       long_name="ice volume transport"                                         unit="m/day"          />

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/CONFIG/SHARED/namelist_ice_lim3_ref

@@ -88 +88 @@
                                     !     advised value: 1/3 (rn_nevp=120) or 1/9 (rn_nevp=300)
    ln_landfast    =  .false.        !  landfast ice parameterization (T or F)                           
-   rn_gamma       =    0.2          !     (ln_landfast=T)  fraction of ocean depth that ice must reach to initiate landfast
+   rn_gamma       =    0.15         !     (ln_landfast=T)  fraction of ocean depth that ice must reach to initiate landfast
                                     !                      recommended range: [0.1 ; 0.25]
-   rn_icebfr      =    5.6e-06      !     (ln_landfast=T)  maximum bottom stress per unit area of contact                  
+   rn_icebfr      =    10.          !     (ln_landfast=T)  maximum bottom stress per unit area of contact (N/m2)                 
                                     !                      a very large value ensures ice velocity=0 even with a small contact area
-                                    !                      recommended range: ??
+                                    !                      recommended range: ?? (should be greater than atm-ice stress => >0.1 N/m2)
 /
 !------------------------------------------------------------------------------

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90

@@ -323 +323 @@
             ze3va =  ( 1._wp - r_vvl ) * fse3v_n(ji,jj,1) + r_vvl   * fse3v_a(ji,jj,1) 
             va(ji,jj,1) = va(ji,jj,1) + p2dt * 0.5_wp * ( vtau_b(ji,jj) + vtau(ji,jj) )   &
-               &                                      / ( ze3va * rau0 ) 
+               &                                      / ( ze3va * rau0 ) * vmask(ji,jj,1)
 #else
             va(ji,jj,1) = vb(ji,jj,1) &
                &                   + p2dt *(va(ji,jj,1) +  0.5_wp * ( vtau_b(ji,jj) + vtau(ji,jj) )   &
-               &                                                       / ( fse3v(ji,jj,1) * rau0     )  )
+               &                                      / ( fse3v(ji,jj,1) * rau0     ) * vmask(ji,jj,1) )
 #endif
          END DO

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90

@@ -469 +469 @@
          !
          ztrs(:,:,:,1) = ptb(:,:,:,jn)
+         ztrs(:,:,1,2) = ptb(:,:,1,jn)
+         ztrs(:,:,1,3) = ptb(:,:,1,jn)
          zwzts(:,:,:) = 0._wp