remove subdirs spack/opt/spack from upstream definitions, as it collides with...

remove subdirs spack/opt/spack from upstream definitions, as it collides with the naming scheme at DKRZ

examples/01_real-from-ideal+psp.sh

@@ -104,7 +104,7 @@ spack:
   user_cache_path:  "$SCRATCH/autoicon-spackcache" # spack puts data here when bootstrapping, leave empty to use home folder
   user_config_path: "$SCRATCH/autoicon-spackconfig" # spack puts data here when bootstrapping, leave empty to use home folder
   disable_local_config: false # if true, spack installs into spack source dir
-  upstreams: "/software/opt/focal/x86_64/spack/2023.02"
+  upstreams: "/software/opt/focal/x86_64/spack/2023.02/spack/opt/spack"
 
 icon:
   #build_cmd: "icon-nwp@%ICON.VERSION%% %SPACK.COMPILER%+debug+petsc target=x86_64_v2 ^openmpi+pmi+legacylaunchers schedulers=slurm fabrics=ucx ucx+dc+dm+ib_hw_tm+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs"

examples/01_real-from-ideal.sh

@@ -104,7 +104,7 @@ spack:
   user_cache_path:  "$SCRATCH/autoicon-spackcache" # spack puts data here when bootstrapping, leave empty to use home folder
   user_config_path: "$SCRATCH/autoicon-spackconfig" # spack puts data here when bootstrapping, leave empty to use home folder
   disable_local_config: false # if true, spack installs into spack source dir
-  upstreams: "/software/opt/focal/x86_64/spack/2023.02"
+  upstreams: "/software/opt/focal/x86_64/spack/2023.02/spack/opt/spack"
 
 icon:
   #build_cmd: "icon-nwp@%ICON.VERSION%% %SPACK.COMPILER%+debug+petsc target=x86_64_v2 ^openmpi+pmi+legacylaunchers schedulers=slurm fabrics=ucx ucx+dc+dm+ib_hw_tm+mlx5_dv+rc+rdmacm+thread_multiple+ud+verbs"

platforms/common/spack_utils.sh

@@ -15,9 +15,7 @@ function _install_spack() {
       i=$((i+1))
       cat << EOF >> $UPSTREAMS_CONFIG
   spack-instance-$i:
-      install_tree: $UP/spack/opt/spack
-      modules:
-        tcl: $UP/spack/share/spack/modules
+      install_tree: $UP
 EOF
     done
   fi