Merge branch 'develop-fmasson' of ssh://www.climate.be:3022/pbarriat/ecearth_patch into develop-fmasson

3.3.0/runtime/classic/ctrl/file_def_nemo-lim3.xml

@@ -22,6 +22,7 @@
           <field field_ref="iceconc"          name="siconc"  />
           <field field_ref="icevolu"          name="sivolu"  />
           <field field_ref="icevel_mv"        name="sivelo"  />
+          <field field_ref="snothic"          name="snthic"     long_name="surface_snow_thickness"   />
         </file>
       </file_group>
 

3.3.0/runtime/classic/ctrl/file_def_nemo-opa.xml

@@ -449,30 +449,99 @@
         </file>
 
 	<file id="file13" name_suffix="_diaptr" description="diaptr variables" >
-	  <field field_ref="zomsfglo"          name="zomsfglo"  grid_ref="grid_ptr_W_3D" />
-          <field field_ref="zomsfatl"          name="zomsfatl"  grid_ref="grid_ptr_W_3D" />
-          <field field_ref="zomsfpac"          name="zomsfpac"  grid_ref="grid_ptr_W_3D" />
-          <field field_ref="zomsfind"          name="zomsfind"  grid_ref="grid_ptr_W_3D" />
-          <field field_ref="zomsfipc"          name="zomsfipc"  grid_ref="grid_ptr_W_3D" />
-          <field field_ref="zotemglo"          name="zotemglo"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zotematl"          name="zotematl"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zotempac"          name="zotempac"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zotemind"          name="zotemind"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zotemipc"          name="zotemipc"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zosalglo"          name="zosalglo"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zosalatl"          name="zosalatl"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zosalpac"          name="zosalpac"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zosalind"          name="zosalind"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zosalipc"          name="zosalipc"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zosrfglo"          name="zosrfglo"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zosrfatl"          name="zosrfatl"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zosrfpac"          name="zosrfpac"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zosrfind"          name="zosrfind"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="zosrfipc"          name="zosrfipc"  grid_ref="grid_ptr_T_3D" />
-          <field field_ref="sophtadv"          name="sophtadv"  grid_ref="grid_ptr_T_2D" />
-          <field field_ref="sophtldf"          name="sophtldf"  grid_ref="grid_ptr_T_2D" />
-          <field field_ref="sopstadv"          name="sopstadv"  grid_ref="grid_ptr_T_2D" />
-          <field field_ref="sopstldf"          name="sopstldf"  grid_ref="grid_ptr_T_2D" />
+          <field id="zomsfglo"          long_name="Meridional Stream-Function: Global"                             unit="Sv"         grid_ref="grid_znl_W_3D" />
+          <field id="zomsfatl"          long_name="Meridional Stream-Function: Atlantic"                           unit="Sv"         grid_ref="grid_znl_W_3D" />
+          <field id="zomsfpac"          long_name="Meridional Stream-Function: Pacific"                            unit="Sv"         grid_ref="grid_znl_W_3D" />
+          <field id="zomsfind"          long_name="Meridional Stream-Function: Indian"                             unit="Sv"         grid_ref="grid_znl_W_3D" />
+          <field id="zomsfipc"          long_name="Meridional Stream-Function: Pacific+Indian"                     unit="Sv"         grid_ref="grid_znl_W_3D" />
+          <field id="zotemglo"          long_name="Zonal Mean Temperature : Global"                                unit="degree_C"   grid_ref="grid_znl_T_3D" />
+          <field id="zotematl"          long_name="Zonal Mean Temperature : Atlantic"                              unit="degree_C"   grid_ref="grid_znl_T_3D" />
+          <field id="zotempac"          long_name="Zonal Mean Temperature : Pacific"                               unit="degree_C"   grid_ref="grid_znl_T_3D" />
+          <field id="zotemind"          long_name="Zonal Mean Temperature : Indian"                                unit="degree_C"   grid_ref="grid_znl_T_3D" />
+          <field id="zotemipc"          long_name="Zonal Mean Temperature : Pacific+Indian"                        unit="degree_C"   grid_ref="grid_znl_T_3D" />
+          <field id="zosalglo"          long_name="Zonal Mean Salinity : Global"                                   unit="0.001"      grid_ref="grid_znl_T_3D" />
+          <field id="zosalatl"          long_name="Zonal Mean Salinity : Atlantic"                                 unit="0.001"      grid_ref="grid_znl_T_3D" />
+          <field id="zosalpac"          long_name="Zonal Mean Salinity : Pacific"                                  unit="0.001"      grid_ref="grid_znl_T_3D" />
+          <field id="zosalind"          long_name="Zonal Mean Salinity : Indian"                                   unit="0.001"      grid_ref="grid_znl_T_3D" />
+          <field id="zosalipc"          long_name="Zonal Mean Salinity : Pacific+Indian"                           unit="0.001"      grid_ref="grid_znl_T_3D" />
+          <field id="zosrfglo"          long_name="Zonal Mean Surface"                                             unit="m2"         grid_ref="grid_znl_T_3D" />
+          <field id="zosrfatl"          long_name="Zonal Mean Surface : Atlantic"                                  unit="m2"         grid_ref="grid_znl_T_3D" />
+          <field id="zosrfpac"          long_name="Zonal Mean Surface : Pacific"                                   unit="m2"         grid_ref="grid_znl_T_3D" />
+          <field id="zosrfind"          long_name="Zonal Mean Surface : Indian"                                    unit="m2"         grid_ref="grid_znl_T_3D" />
+          <field id="zosrfipc"          long_name="Zonal Mean Surface : Pacific+Indian"                            unit="m2"         grid_ref="grid_znl_T_3D" />
+          <field id="sophtadv"          long_name="Advective Heat Transport"                                       unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtadv_atl"      long_name="Advective Heat Transport: Atlantic"                             unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtadv_pac"      long_name="Advective Heat Transport: Pacific"                              unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtadv_ind"      long_name="Advective Heat Transport: Indian"                               unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtadv_ipc"      long_name="Advective Heat Transport: Pacific+Indian"                       unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtldf"          long_name="Diffusive Heat Transport"                                       unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtldf_atl"      long_name="Diffusive Heat Transport: Atlantic"                             unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtldf_pac"      long_name="Diffusive Heat Transport: Pacific"                              unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtldf_ind"      long_name="Diffusive Heat Transport: Indian"                               unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtldf_ipc"      long_name="Diffusive Heat Transport: Pacific+Indian"                       unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtove"          long_name="Overturning Heat Transport"                                     unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtove_atl"      long_name="Overturning Heat Transport: Atlantic"                           unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtove_pac"      long_name="Overturning Heat Transport: Pacific"                            unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtove_ind"      long_name="Overturning Heat Transport: Indian"                             unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtove_ipc"      long_name="Overturning Heat Transport: Pacific+Indian"                     unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtbtr"          long_name="Barotropic Heat Transport"                                      unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtbtr_atl"      long_name="Barotropic Heat Transport: Atlantic"                            unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtbtr_pac"      long_name="Barotropic Heat Transport: Pacific"                             unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtbtr_ind"      long_name="Barotropic Heat Transport: Indian"                              unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophtbtr_ipc"      long_name="Barotropic Heat Transport: Pacific+Indian"                      unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophteiv"          long_name="Heat Transport from mesoscale eddy advection"                   unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophteiv_atl"      long_name="Heat Transport from mesoscale eddy advection: Atlantic"         unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophteiv_pac"      long_name="Heat Transport from mesoscale eddy advection: Pacific"          unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophteiv_ind"      long_name="Heat Transport from mesoscale eddy advection: Indian"           unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sophteiv_ipc"      long_name="Heat Transport from mesoscale eddy advection: Pacific+Indian"   unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sopstadv"          long_name="Advective Salt Transport"                                       unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstadv_atl"      long_name="Advective Salt Transport: Atlantic"                             unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstadv_pac"      long_name="Advective Salt Transport: Pacific"                              unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstadv_ind"      long_name="Advective Salt Transport: Indian"                               unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstadv_ipc"      long_name="Advective Salt Transport: Pacific+Indian"                       unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstove"          long_name="Overturning Salt Transport"                                     unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstove_atl"      long_name="Overturning Salt Transport: Atlantic"                           unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstove_pac"      long_name="Overturning Salt Transport: Pacific"                            unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstove_ind"      long_name="Overturning Salt Transport: Indian"                             unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstove_ipc"      long_name="Overturning Salt Transport: Pacific+Indian"                     unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstbtr"          long_name="Barotropic Salt Transport"                                      unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstbtr_atl"      long_name="Barotropic Salt Transport: Atlantic"                            unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstbtr_pac"      long_name="Barotropic Salt Transport: Pacific"                             unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstbtr_ind"      long_name="Barotropic Salt Transport: Indian"                              unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstbtr_ipc"      long_name="Barotropic Salt Transport: Pacific+Indian"                      unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstldf"          long_name="Diffusive Salt Transport"                                       unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstldf_atl"      long_name="Diffusive Salt Transport: Atlantic"                             unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstldf_pac"      long_name="Diffusive Salt Transport: Pacific"                              unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstldf_ind"      long_name="Diffusive Salt Transport: Indian"                               unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopstldf_ipc"      long_name="Diffusive Salt Transport: Pacific+Indian"                       unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopsteiv"          long_name="Salt Transport from mesoscale eddy advection"                   unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopsteiv_atl"      long_name="Salt Transport from mesoscale eddy advection: Atlantic"         unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopsteiv_pac"      long_name="Salt Transport from mesoscale eddy advection: Pacific"          unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopsteiv_ind"      long_name="Salt Transport from mesoscale eddy advection: Indian"           unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopsteiv_ipc"      long_name="Salt Transport from mesoscale eddy advection: Pacific+Indian"   unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopht_vt"          long_name="Heat Transport"                                                 unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sopht_vt_atl"      long_name="Heat Transport: Atlantic"                                       unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sopht_vt_ind"      long_name="Heat Transport: Indian"                                         unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sopht_vt_pac"      long_name="Heat Transport: Pacific"                                        unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sopht_vt_ipc"      long_name="Heat Transport: Indo-Pacific"                                   unit="PW"         grid_ref="grid_znl_T_2D" />
+          <field id="sopst_vs"          long_name="Salt Transport"                                                 unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopst_vs_atl"      long_name="Salt Transport: Atlantic"                                       unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopst_vs_ind"      long_name="Salt Transport: Indian"                                         unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopst_vs_pac"      long_name="Salt Transport: Pacific"                                        unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="sopst_vs_ipc"      long_name="Salt Transport: Indo-Pacific"                                   unit="Giga g/s"   grid_ref="grid_znl_T_2D" />
+          <field id="zomsf_znl"         long_name="Meridional Stream-Function : All basins"                        unit="Sv"         grid_ref="grid_znl_W_basin_3D" />
+          <field id="sophtove_znl"      long_name="Overturning Heat Transport: All basins"                         unit="PW"         grid_ref="grid_znl_T_basin_2D" />
+          <field id="sopstove_znl"      long_name="Overturning Salt Transport: All basins"                         unit="Giga g/s"   grid_ref="grid_znl_T_basin_2D" />
+          <field id="sophtbtr_znl"      long_name="Barotropic Heat Transport: All basins"                          unit="PW"         grid_ref="grid_znl_T_basin_2D" />
+          <field id="sopstbtr_znl"      long_name="Barotropic Salt Transport: All basins"                          unit="Giga g/s"   grid_ref="grid_znl_T_basin_2D" />
+          <field id="sophtadv_znl"      long_name="Advective Heat Transport: All basins"                           unit="PW"         grid_ref="grid_znl_T_basin_2D" />
+          <field id="sopstadv_znl"      long_name="Advective Salt Transport: All basins"                           unit="Giga g/s"   grid_ref="grid_znl_T_basin_2D" />
+          <field id="sophtldf_znl"      long_name="Diffusive Heat Transport: All basins"                           unit="PW"         grid_ref="grid_znl_T_basin_2D" />
+          <field id="sopstldf_znl"      long_name="Diffusive Salt Transport: All basins"                           unit="Giga g/s"   grid_ref="grid_znl_T_basin_2D" />
+          <field id="sopht_vt_znl"      long_name="Heat Transport : All basins"                                    unit="PW"         grid_ref="grid_znl_T_basin_2D" />
+          <field id="sopst_vs_znl"      long_name="Salt Transport : All basins"                                    unit="Giga g/s"   grid_ref="grid_znl_T_basin_2D" />
+          <field id="sophteiv_znl"      long_name="Heat Transport from mesoscale eddy advection: All basins"       unit="PW"         grid_ref="grid_znl_T_basin_2D" />
+          <field id="sopsteiv_znl"      long_name="Salt Transport from mesoscale eddy advection : All basins"      unit="Giga g/s"   grid_ref="grid_znl_T_basin_2D" />
         </file>
 
 

3.3.0/runtime/classic/ece-ifs+nemo.sh.tmpl

@@ -709,7 +709,7 @@ do
                 # Fixed year forcing, requires cdo!
                 # If cdo is not available at runtime you need to fix proper
                 # icmcl files beforehand and use them here
-                cdo setyear,$yr ${ini_data_dir}/ifs/${ifs_grid}/icmcl_v16/icmcl_${ifs_cmip_fixyear}.grb ${tempfile}
+                ${cdo} setyear,$yr ${ini_data_dir}/ifs/${ifs_grid}/icmcl_v16/icmcl_${ifs_cmip_fixyear}.grb ${tempfile}
                 cat ${tempfile} >> ICMCL${exp_name}INIT
             fi
         done

3.3.0/runtime/classic/zenobe.sh.tmpl

@@ -25,3 +25,6 @@ set -x
 
 # Directories
 start_dir=${PBS_O_WORKDIR-$PWD}
+
+# CDO
+cdo="/projects/acad/ecearth/opt/cdo/bin/cdo"