Merge branch 'geomar_dev' into geomar_dev_without_src_changes

Author: mandresm

configs/components/echam/echam.yaml

@@ -83,6 +83,11 @@ compile_infos:
           6.3.05p2-foci_oasismct4:
             branch: esm-tools-oasis3mct4
             git-repository: https://git.geomar.de/foci/src/echam.git
+            add_export_vars:
+              MPEU_Fortran_INCLUDE_DIRECTORIES: "${oasis3mct.model_dir}/INSTALL_OASIS.ESMTOOLS/include"
+              MPEU_Fortran_LIBRARIES: "${oasis3mct.model_dir}/INSTALL_OASIS.ESMTOOLS/lib"
+              #MPEU_Fortran_INCLUDE_DIRECTORIES: "/home/shktkeme/esm/models/foci-agrif_mops_oasismct4/oasis/INSTALL_OASIS.ESMTOOLS/include"
+              #MPEU_Fortran_LIBRARIES: "/home/shktkeme/esm/models/foci-agrif_mops_oasismct4/oasis/INSTALL_OASIS.ESMTOOLS/lib"
           6.3.05p2-wiso:
             branch: "wiso"
             clean_command: rm -rf src/echam/bin; rm -rf bin; make clean

configs/components/jsbach/jsbach.datasets.yaml

@@ -48,8 +48,10 @@ forcing_sources:
         Ndepo_ssp:
                 # These files are 12-monthly; see README.md in Ndepo/ directory
                 # NOTE: ssp370 might be missing in this directory
+                "${input_dir_couple}/${Ndepo_path}1850.nc":
+                    to: 1850
                 "${input_dir_couple}/${Ndepo_path}@YEAR@.nc":
-                    from: 1850
+                    from: 1851
                     to: 2099
                 "${input_dir_couple}/${Ndepo_path}2099.nc":
                     from: 2100

configs/components/jsbach/jsbach.yaml

@@ -348,6 +348,7 @@ choose_scenario_is_ssp:
         False:
                 ssp_num: null
                 Ndepo_sufix: ""
+                cover_fract_cmip6: cover_fract_hist_scenario
 
 choose_echam.with_wiso:
         True: