Changeset 8268

Timestamp:

2017-07-03T17:01:04+02:00 (7 years ago)

Author:

clem

Message:

commit bug fixes, so that all sette tests passed (except SAS as usual)

Location:

branches/2017/dev_r8183_ICEMODEL/NEMOGCM

Files:

• CONFIG/ORCA2_LIM3_PISCES/EXP00/file_def_nemo.xml (modified) (1 diff)
• CONFIG/ORCA2_SAS_LIM3/cpp_ORCA2_SAS_LIM3.fcm (modified) (1 diff)
• CONFIG/SHARED/namelist_ref (modified) (1 diff)
• NEMO/OPA_SRC/SBC/albedo.F90 (modified) (2 diffs)
• NEMO/TOP_SRC/trc.F90 (modified) (1 diff)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/file_def_nemo.xml

@@ -95 +95 @@
      <field field_ref="avt"          name="difvho"   />
      <field field_ref="w_masstr"     name="vovematr" />
-          <!-- variables available with key_zdftmx_new -->
+          <!-- variables available with ln_zdfiwm -->
           <field field_ref="av_wave"      name="av_wave"    />
           <field field_ref="bn2"          name="bn2"        />
-          <field field_ref="bflx_tmx"     name="bflx_tmx"   />
-          <field field_ref="pcmap_tmx"    name="pcmap_tmx"  />
-          <field field_ref="emix_tmx"     name="emix_tmx"   />
+          <field field_ref="bflx_iwm"     name="bflx_iwm"   />
+     <field field_ref="pcmap_iwm"    name="pcmap_iwm"  />
+          <field field_ref="emix_iwm"     name="emix_iwm"   />
           <field field_ref="av_ratio"     name="av_ratio"   />
    </file>

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/cpp_ORCA2_SAS_LIM3.fcm

@@ -1 @@
- bld::tool::fppkeys key_trabbl key_lim3  key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi
+ bld::tool::fppkeys key_lim3 key_iomput key_mpp_mpi

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -446 +446 @@
    rn_alb_idry  =  0.60  !  dry ice albedo          : 0.72 ( '' )          ; 0.60 ( '' )          ; obs 0.54-0.65 ( '' )
    rn_alb_imlt  =  0.50  !  bare puddled ice albedo : 0.53 ( '' )          ; 0.50 ( '' )          ; obs 0.49-0.58 ( '' )
-   rn_alb_dpnd  =  0.27  !  bare puddled ice albedo : 0.25 ( '' )          ; 0.27 ( '' )            ; obs 0.10-0.30 ( '' )
+   rn_alb_dpnd  =  0.27  !  ponded ice albedo       : 0.25 ( '' )          ; 0.27 ( '' )          ; obs 0.10-0.30 ( '' )
 /
 !-----------------------------------------------------------------------

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/albedo.F90

@@ -356 +356 @@
       !!----------------------------------------------------------------------
       INTEGER  ::   ios                 ! Local integer output status for namelist read
-      NAMELIST/namsbc_alb/ nn_ice_alb, rn_alb_sdry, rn_alb_smlt, rn_alb_idry , rn_alb_imlt
+      NAMELIST/namsbc_alb/ nn_ice_alb, rn_alb_sdry, rn_alb_smlt, rn_alb_idry, rn_alb_imlt, rn_alb_dpnd
       !!----------------------------------------------------------------------
       !
@@ -380 +380 @@
          WRITE(numout,*) '      albedo of dry ice                                   rn_alb_idry = ', rn_alb_idry
          WRITE(numout,*) '      albedo of bare puddled ice                          rn_alb_imlt = ', rn_alb_imlt
+         WRITE(numout,*) '      albedo of ponded ice                                rn_alb_dpnd = ', rn_alb_dpnd
       ENDIF
       !

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/TOP_SRC/trc.F90

@@ -172 +172 @@
    CHARACTER(len=20), PUBLIC, ALLOCATABLE,  SAVE,  DIMENSION(:)   ::  cn_trc               ! Choice of boundary condition for tracers
    INTEGER,           PUBLIC, ALLOCATABLE,  SAVE,  DIMENSION(:)   ::  nn_trcdmp_bdy        !: =T Tracer damping
+!$AGRIF_DO_NOT_TREAT
    ! External data structure of BDY for TOP. Available elements: cn_obc, ll_trc, trcnow, dmp
    TYPE(OBC_DATA),    PUBLIC, ALLOCATABLE, DIMENSION(:,:), TARGET ::  trcdta_bdy           !: bdy external data (local process)
-   !
-
+!$AGRIF_END_DO_NOT_TREAT
    !!----------------------------------------------------------------------
    !! NEMO/TOP 3.3.1 , NEMO Consortium (2010)