Merge branch 'configuration_selection' into 'master'

Adding additional files to make creation of experiments easier

See merge request !10

.gitlab-ci.yml

@@ -3,6 +3,9 @@ stages:
   - build
   - run_tests
 
+variables:
+  PROJECT_BRANCH: $CI_COMMIT_REF_NAME
+
 clean-spack:
   stage: clean
   script:

conf/build_only.yml

+DEFAULT:
+  CUSTOM_CONFIG:
+    PRE:
+      - "%PROJDIR%/conf/common"
+      - "%PROJDIR%/conf/build_only"
\ No newline at end of file

conf/real-from-dwd-ana.yml

+DEFAULT:
+  CUSTOM_CONFIG:
+    PRE:
+      - "%PROJDIR%/conf/common"
+      - "%PROJDIR%/conf/real-from-dwd-ana"
\ No newline at end of file

conf/real-from-ideal.yml

+DEFAULT:
+  CUSTOM_CONFIG:
+    PRE:
+      - "%PROJDIR%/conf/common"
+      - "%PROJDIR%/conf/real-from-ideal"
\ No newline at end of file

examples/example_utils.sh

@@ -18,7 +18,9 @@ function run_autoicon_example() {
   configure_and_install_autosubmit
 
   # Set up project
-  setup_project "$EXPID"
+  EXPID=$( setup_project )
+
+  echo "NewEXPID=${EXPID}"
 
   # Create and run the experiment
   create_and_run_experiment "$EXPID"
@@ -27,7 +29,7 @@ function run_autoicon_example() {
 
 function setup_environment() {
   # Set Autosubmit version and define some directories
-  AUTOSUBMIT_VERSION="4.0.76"
+  AUTOSUBMIT_VERSION="4.0.79"
   # Define the path of the directory where this script is located
   SCRIPTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
   # Define the root path of the project
@@ -66,49 +68,15 @@ function configure_and_install_autosubmit() {
 }
 
 function setup_project() {
-  local EXPID=$1
   PROJECT_ORIGIN="https://gitlab.physik.uni-muenchen.de/w2w/autoicon.git"
   : ${PROJECT_BRANCH:="master"}
 
   # If experiment directory doesn't exist, create it and set up the experiment
-  if [ ! -e autosubmit/$EXPID/ ]; then
-    mkdir -p autosubmit/$EXPID/
-    autosubmit expid -min -H lmu -d myiconsim -repo $PROJECT_ORIGIN -b $PROJECT_BRANCH &> >(tee autosubmit/$EXPID/log.autosubmit.expid)
-    AUTOID=$(grep Experiment autosubmit/$EXPID/log.autosubmit.expid | awk '{print $2}')
-    mv -v autosubmit/$AUTOID/* autosubmit/$EXPID
-    rmdir -v autosubmit/$AUTOID
-  fi
-
-  # Create and write the minimal config file
-  cat >autosubmit/$EXPID/conf/minimal.yml <<EOF
-ICON_CASE: "${ICON_CASE}"
-
-CONFIG:
-  AUTOSUBMIT_VERSION: "$AUTOSUBMIT_VERSION"
-  TOTALJOBS: 20
-  MAXWAITINGJOBS: 20
-  RETRIALS: 0
-DEFAULT:
-  EXPID: "$EXPID"
-  HPCARCH: "${PLATFORM}" # use LMU to run on cluster
-  CUSTOM_CONFIG:
-    PRE:
-      - "%PROJDIR%/conf/common"
-      - "%PROJDIR%/conf/%ICON_CASE%"
-
-PROJECT:
-  PROJECT_TYPE: "git"
-  PROJECT_DESTINATION: "autoicon"
-GIT:
-  PROJECT_ORIGIN: "$PROJECT_ORIGIN"
-  PROJECT_BRANCH: "$PROJECT_BRANCH"
-  PROJECT_COMMIT: ""
-  PROJECT_SUBMODULES: ""
-  FETCH_SINGLE_BRANCH: True
-EOF
+  autosubmit expid -min -H LOCAL -d myiconsim -repo $PROJECT_ORIGIN -b $PROJECT_BRANCH -conf "conf/${ICON_CASE}.yml" &> autosubmit/log.autosubmit.expid
+  EXPID=$(grep "Experiment.*created" autosubmit/log.autosubmit.expid | awk '{print $2}')
 
   # Create and write the additional config file
-  cat >autosubmit/${EXPID}/conf/01_myconf.yml <<EOF
+  cat > autosubmit/${EXPID}/conf/01_myconf.yml <<EOF
 spack:
   init: "" # command to load spack environment, e.g. module load spack, use spack/setup-env.sh if empty
   url: https://github.com/spack/spack.git # url to download spack if necessary
@@ -152,6 +120,7 @@ $EXTRA_NAMELIST
 EOF
   fi
 
+echo "${EXPID}"
 }
 
 function create_and_run_experiment() {

spack_repo/packages/dwd-icon-tools/package.py

@@ -70,7 +70,7 @@ class DwdIconTools(Package):
                 "FCFLAGS": "-I/usr/include -stand f08 -O2 -g -fpp -qopenmp -check bounds -Wunused -DNOMPI",
                 "CFLAGS": "-std=gnu99 -O3 -DHAVE_LIBNETCDF -DHAVE_NETCDF4 -DHAVE_CF_INTERFACE -DHAVE_LIBGRIB "
                           "-DHAVE_LIBGRIB_API -DpgiFortran -D__ICON__ -DHAVE_CONFIG_H -traceback",
-                "LIBS": f"-leccodes -lgfortran -lhdf5 -lxml2",
+                "LIBS": f"-leccodes -lhdf5 -lxml2",
                 "V": "1",
                 "VERBOSE": "1",
                 "LDFLAGS": "-Wl,--copy-dt-needed-entries",