Merge branch...

Merge branch '118-add-atmospheric-pressure-to-exchanges-variables-in-cpl_oasis-testcase' into 'branch_4.2'

tests/CPL_OASIS/EXPREF/namelist_cfg

@@ -151,7 +151,7 @@
    sn_rcv_cal    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_co2    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_iceflx =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
-   sn_rcv_mslp   =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_rcv_mslp   =   'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_ts_ice =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_isf    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
    sn_rcv_icb    =   'none'                 ,    'no'    ,     ''      ,         ''           ,   ''
@@ -216,7 +216,7 @@
 !-----------------------------------------------------------------------
 &namberg       !   iceberg parameters                                   (default: OFF)
 !-----------------------------------------------------------------------
-   ln_icebergs = .true.    ! activate iceberg floats (force =F with "key_agrif")
+   ln_icebergs = .false.    ! activate iceberg floats (force =F with "key_agrif")
 
    cn_dir = './'  !  root directory for the location of drag coefficient files
    !______!___________!___________________!______________!______________!_________!___________!__________!__________!_______________!

tools/TOYATM/EXP/namcouple

@@ -6,7 +6,7 @@
 # Any line beginning with # is ignored. Blank lines are not allowed
 ####################################################################
  $NFIELDS 
-12
+13
  $END
 ############################################
  $RUNTIME 
@@ -89,6 +89,15 @@ INT=1
 BILINEAR LR SCALAR LATLON 1
 INT=1
 #
+ATSOLFLX O_MSLP 1 5400 4 rst.nc EXPOUT
+180 90 180 148 lmdz torc
+P 0 P 2
+CHECKIN BLASOLD SCRIPR CHECKOUT
+INT=1
+100000.  0
+BILINEAR LR SCALAR LATLON 1
+INT=1
+#
 ATFLXEMP OTotRain 1 5400 3 rst.nc EXPOUT
 180 90 180 148 lmdz torc
 P 0 P 2