diff --git a/cmor/mpiesm/scripts/palmod2_cmor-rewrite_MPI-ESM1-2_mpism_auto.h b/cmor/mpiesm/scripts/palmod2_cmor-rewrite_MPI-ESM1-2_mpism_auto.h
index 8222d200c900fa142293a7d11d3368a0186cb23f..f6dec030cda1458b47cd38fdd4f3445dc0856ddb 100644
--- a/cmor/mpiesm/scripts/palmod2_cmor-rewrite_MPI-ESM1-2_mpism_auto.h
+++ b/cmor/mpiesm/scripts/palmod2_cmor-rewrite_MPI-ESM1-2_mpism_auto.h
@@ -46,7 +46,7 @@ done
 cn='acabfIs dtb orogIs tlIs tsIs'
 for var in $cn; do
   { (if_requested $member $icemod IdecAnt $var $chunk '${icemod_dec_chunk}' || continue
-  find_file "$sdir" "pism_ant_${period}*.nc" ifile >> $err.find_file.IdecAnt 2>&1
+  find_file "$sdir" "pism_ant_${period}.nc" ifile >> $err.find_file.IdecAnt 2>&1
   mkdir -p $dr/$submodel/IdecAnt_${var}
   echo $cdo cmor,IdecAnt,i=$it,mt=$mt,dr=$dr/$submodel/IdecAnt_${var},vd=$vd,cn=$var,ta=cmip,di=$di ${cdochain-} $ifile
   $cdo cmor,IdecAnt,i=$it,mt=$mt,dr=$dr/$submodel/IdecAnt_${var},vd=$vd,cn=$var,ta=cmip,di=$di ${cdochain-} $ifile || echo ERROR
@@ -57,7 +57,7 @@ done
 cn='acabfIs dtb orogIs tlIs tsIs'
 for var in $cn; do
   { (if_requested $member $icemod IdecGre $var $chunk '${icemod_dec_chunk}' || continue
-  find_file "$sdir" "pism_nh_${period}*.nc" ifile >> $err.find_file.IdecGre 2>&1
+  find_file "$sdir" "pism_nh_${period}.nc" ifile >> $err.find_file.IdecGre 2>&1
   mkdir -p $dr/$submodel/IdecGre_${var}
   echo $cdo cmor,IdecGre,i=$it,mt=$mt,dr=$dr/$submodel/IdecGre_${var},vd=$vd,cn=$var,ta=cmip,di=$di ${cdochain-} $ifile
   $cdo cmor,IdecGre,i=$it,mt=$mt,dr=$dr/$submodel/IdecGre_${var},vd=$vd,cn=$var,ta=cmip,di=$di ${cdochain-} $ifile || echo ERROR
diff --git a/cmor/mpiesm/scripts/palmod2_cmor-rewrite_MPI-ESM1-2_vilma_auto.h b/cmor/mpiesm/scripts/palmod2_cmor-rewrite_MPI-ESM1-2_vilma_auto.h
index 118c288f0f6c9deaf170e9d2c79806938a5a012b..d0e025cf89a90dccef6bc1ff8c24fa60c3d8de68 100644
--- a/cmor/mpiesm/scripts/palmod2_cmor-rewrite_MPI-ESM1-2_vilma_auto.h
+++ b/cmor/mpiesm/scripts/palmod2_cmor-rewrite_MPI-ESM1-2_vilma_auto.h
@@ -3,7 +3,7 @@ cn='orog sftgif'
 for var in $cn; do
   { (if_requested $member $slmod SLdec $var $chunk '${slmod_input_dec_chunk}' || continue
   mkdir -p $dr/$submodel/SLdec_${var}
-  find_file "$sdir" "SLdec_${var}_${period_bk}*.nc" ifile >> $err.find_file.SLdec 2>&1
+  find_file "$sdir" "SLdec_${var}_${period_bk}.nc" ifile >> $err.find_file.SLdec 2>&1
   echo $cdo cmor,SLdec,i=$it,mt=$mt,dr=$dr/$submodel/SLdec_${var},vd=$vd,cn=$var,ta=cmip,di=$di ${cdochain-} $ifile
   $cdo cmor,SLdec,i=$it,mt=$mt,dr=$dr/$submodel/SLdec_${var},vd=$vd,cn=$var,ta=cmip,di=$di ${cdochain-} $ifile || echo ERROR
   )&; }>>$err.$var.SLdec 2>&1
diff --git a/cmor/mpiesm/scripts/palmod2_diagnostic_MPI-ESM1-2_mpism_auto.h b/cmor/mpiesm/scripts/palmod2_diagnostic_MPI-ESM1-2_mpism_auto.h
index d9829d1e50a4457616d664cc3bc5da1242c3ab98..93e24e820ea4e64445d728ff2d7723f51dbaf08c 100644
--- a/cmor/mpiesm/scripts/palmod2_diagnostic_MPI-ESM1-2_mpism_auto.h
+++ b/cmor/mpiesm/scripts/palmod2_diagnostic_MPI-ESM1-2_mpism_auto.h
@@ -1,7 +1,7 @@
 #-- Diagnostic for mpism (ESM: MPI-ESM1-2) variable libmassbffl / table IdecAnt
 # Editor Note: This variable needs to be converted to the correct units. So it should bmelt*ice_density (917)/secondsperyear. Requires aggregation to account for leap years. Added recipe just for testing.
 { (if_requested $member $icemod IdecAnt libmassbffl $chunk '${icemod_dec_chunk}' && {
-  find_file -e            "$sdir" "pism_ant_${period}*.nc" ifile
+  find_file -e            "$sdir" "pism_ant_${period}.nc" ifile
   echo "$cdo -f nc -O \
     -expr,'libmassbffl=bmelt*917/86400/365;' \
        $ifile ${sdir}/out_diag/IdecAnt_libmassbffl_${period}.nc"
@@ -13,7 +13,7 @@
 #-- Diagnostic for mpism (ESM: MPI-ESM1-2) variable libmassbffl / table IdecGre
 # Editor Note: This variable needs to be converted to the correct units. So it should bmelt*ice_density (917)/secondsperyear. Requires aggregation to account for leap years. Added recipe just for testing.
 { (if_requested $member $icemod IdecGre libmassbffl $chunk '${icemod_dec_chunk}' && {
-  find_file -e            "$sdir" "pism_nh_${period}*.nc" ifile
+  find_file -e            "$sdir" "pism_nh_${period}.nc" ifile
   echo "$cdo -f nc -O \
     -expr,'libmassbffl=bmelt*917/86400/365;' \
        $ifile ${sdir}/out_diag/IdecGre_libmassbffl_${period}.nc"
@@ -24,7 +24,7 @@
 
 #-- Diagnostic for mpism (ESM: MPI-ESM1-2) variable sftgifIt / table IdecAnt
 { (if_requested $member $icemod IdecAnt sftgifIt $chunk '${icemod_dec_chunk}' && {
-  find_file -e            "$sdir" "pism_ant_${period}*.nc" ifile
+  find_file -e            "$sdir" "pism_ant_${period}.nc" ifile
   echo "$cdo -f nc -O \
     ${cdochain-} -expr,'ifl=mask==0;gi=mask==2;fi=mask==3;o=mask==4;' \
     $ifile ${sdir}/out_diag/IdecAnt_sftgifIt_$period.nc"
@@ -35,7 +35,7 @@
 
 #-- Diagnostic for mpism (ESM: MPI-ESM1-2) variable sftgifIt / table IdecGre
 { (if_requested $member $icemod IdecGre sftgifIt $chunk '${icemod_dec_chunk}' && {
-  find_file -e            "$sdir" "pism_nh_${period}*.nc" ifile
+  find_file -e            "$sdir" "pism_nh_${period}.nc" ifile
   echo "$cdo -f nc -O \
     ${cdochain-} -expr,'ifl=mask==0;gi=mask==2;fi=mask==3;o=mask==4;' \
     $ifile ${sdir}/out_diag/IdecGre_sftgifIt_$period.nc"
diff --git a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p1f1-CR.runpp b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p1f1-CR.runpp
index d379e12fd38600362d05a6ed7b4256fbce1679e2..344e4cc6d3ba9cab5a439843f93e06d4df3325d8 100755
--- a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p1f1-CR.runpp
+++ b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p1f1-CR.runpp
@@ -426,15 +426,15 @@ function run_agg
 
             # Create softlinks to raw model output - PISM requires special treatment
             if [[ $submodel == "$icemod" ]]; then
-              #ln -sf $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
-              #ln -sf $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
-              cp -v $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
               ncatted -O -h -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_ant_${period}.nc || { echo "ERROR ncatted $sdir/pism_ant_${period}.nc" ; exit 1 ; }
-              cp -v $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
               ncatted -O -h -a ellipsoid,mapping,o,c,WGS84 -a grid_mapping_name,mapping,o,c,polar_stereographic -a false_easting,mapping,o,d,0. -a false_northing,mapping,o,d,0. -a latitude_of_projection_origin,mapping,o,d,90. -a standard_parallel,mapping,o,d,70. -a straight_vertical_longitude_from_pole,mapping,o,d,-45. -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_nh_${period}.nc || { echo "ERROR ncatted $sdir/pism_nh_${period}.nc" ; exit 1 ; }
             elif [[ $submodel == "vilma" ]]; then
               if [[ "${chunks[${submodel}dec]}" == *" ${period: -1} "* ]]; then
-                ln -vsf $rawsdir/vilma_-$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_-$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
+                ln -vsf $rawsdir/vilma_?$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_?$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
               fi
             else
               ln -sf $rawsdir/*_${period}* $sdir/ 2>/dev/null 1>&2 || { echo "ERROR creating links for $period ${RAW_EXP_IDS[$y]} $submodel" && exit 1 ; }
diff --git a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p1f2-CR.runpp b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p1f2-CR.runpp
index afc3389bb0b7f41dec6325dccfea493ad0382ce2..7ec584ccf79c5442e6c5b8046b50c845da6ca478 100755
--- a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p1f2-CR.runpp
+++ b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p1f2-CR.runpp
@@ -426,15 +426,15 @@ function run_agg
 
             # Create softlinks to raw model output - PISM requires special treatment
             if [[ $submodel == "$icemod" ]]; then
-              #ln -sf $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
-              #ln -sf $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
-              cp -v $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
               ncatted -O -h -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_ant_${period}.nc || { echo "ERROR ncatted $sdir/pism_ant_${period}.nc" ; exit 1 ; }
-              cp -v $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
               ncatted -O -h -a ellipsoid,mapping,o,c,WGS84 -a grid_mapping_name,mapping,o,c,polar_stereographic -a false_easting,mapping,o,d,0. -a false_northing,mapping,o,d,0. -a latitude_of_projection_origin,mapping,o,d,90. -a standard_parallel,mapping,o,d,70. -a straight_vertical_longitude_from_pole,mapping,o,d,-45. -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_nh_${period}.nc || { echo "ERROR ncatted $sdir/pism_nh_${period}.nc" ; exit 1 ; }
             elif [[ $submodel == "vilma" ]]; then
               if [[ "${chunks[${submodel}dec]}" == *" ${period: -1} "* ]]; then
-                ln -vsf $rawsdir/vilma_-$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_-$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
+                ln -vsf $rawsdir/vilma_?$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_?$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
               fi
             else
               ln -sf $rawsdir/*_${period}* $sdir/ 2>/dev/null 1>&2 || { echo "ERROR creating links for $period ${RAW_EXP_IDS[$y]} $submodel" && exit 1 ; }
diff --git a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p2f1-CR.runpp b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p2f1-CR.runpp
index be2d0261d3e55f7b961a090af400c092383f8367..b905dc70cbb45a97ec14fdc2985363d95234f715 100755
--- a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p2f1-CR.runpp
+++ b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p2f1-CR.runpp
@@ -426,15 +426,15 @@ function run_agg
 
             # Create softlinks to raw model output - PISM requires special treatment
             if [[ $submodel == "$icemod" ]]; then
-              #ln -sf $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
-              #ln -sf $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
-              cp -v $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
               ncatted -O -h -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_ant_${period}.nc || { echo "ERROR ncatted $sdir/pism_ant_${period}.nc" ; exit 1 ; }
-              cp -v $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
               ncatted -O -h -a ellipsoid,mapping,o,c,WGS84 -a grid_mapping_name,mapping,o,c,polar_stereographic -a false_easting,mapping,o,d,0. -a false_northing,mapping,o,d,0. -a latitude_of_projection_origin,mapping,o,d,90. -a standard_parallel,mapping,o,d,70. -a straight_vertical_longitude_from_pole,mapping,o,d,-45. -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_nh_${period}.nc || { echo "ERROR ncatted $sdir/pism_nh_${period}.nc" ; exit 1 ; }
             elif [[ $submodel == "vilma" ]]; then
               if [[ "${chunks[${submodel}dec]}" == *" ${period: -1} "* ]]; then
-                ln -vsf $rawsdir/vilma_-$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_-$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
+                ln -vsf $rawsdir/vilma_?$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_?$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
               fi
             else
               ln -sf $rawsdir/*_${period}* $sdir/ 2>/dev/null 1>&2 || { echo "ERROR creating links for $period ${RAW_EXP_IDS[$y]} $submodel" && exit 1 ; }
diff --git a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p3f1-CR.runpp b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p3f1-CR.runpp
index f45bf4a7ce7608a92267f55b650e1cb24656c484..a2a035276d19e1cb38435d6f7525dda984fdb332 100755
--- a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p3f1-CR.runpp
+++ b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p3f1-CR.runpp
@@ -426,15 +426,15 @@ function run_agg
 
             # Create softlinks to raw model output - PISM requires special treatment
             if [[ $submodel == "$icemod" ]]; then
-              #ln -sf $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
-              #ln -sf $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
-              cp -v $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
               ncatted -O -h -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_ant_${period}.nc || { echo "ERROR ncatted $sdir/pism_ant_${period}.nc" ; exit 1 ; }
-              cp -v $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
               ncatted -O -h -a ellipsoid,mapping,o,c,WGS84 -a grid_mapping_name,mapping,o,c,polar_stereographic -a false_easting,mapping,o,d,0. -a false_northing,mapping,o,d,0. -a latitude_of_projection_origin,mapping,o,d,90. -a standard_parallel,mapping,o,d,70. -a straight_vertical_longitude_from_pole,mapping,o,d,-45. -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_nh_${period}.nc || { echo "ERROR ncatted $sdir/pism_nh_${period}.nc" ; exit 1 ; }
             elif [[ $submodel == "vilma" ]]; then
               if [[ "${chunks[${submodel}dec]}" == *" ${period: -1} "* ]]; then
-                ln -vsf $rawsdir/vilma_-$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_-$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
+                ln -vsf $rawsdir/vilma_?$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_?$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
               fi
             else
               ln -sf $rawsdir/*_${period}* $sdir/ 2>/dev/null 1>&2 || { echo "ERROR creating links for $period ${RAW_EXP_IDS[$y]} $submodel" && exit 1 ; }
diff --git a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p4f2-CR.runpp b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p4f2-CR.runpp
index 3af0bfdd7022c836aebc1906d54212b84882270e..3a86230018ced42bf900adca0650dbbf64ea20d4 100755
--- a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p4f2-CR.runpp
+++ b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p4f2-CR.runpp
@@ -427,15 +427,15 @@ function run_agg
 
             # Create softlinks to raw model output - PISM requires special treatment
             if [[ $submodel == "$icemod" ]]; then
-              #ln -sf $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
-              #ln -sf $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
-              cp -v $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
               ncatted -O -h -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_ant_${period}.nc || { echo "ERROR ncatted $sdir/pism_ant_${period}.nc" ; exit 1 ; }
-              cp -v $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
               ncatted -O -h -a ellipsoid,mapping,o,c,WGS84 -a grid_mapping_name,mapping,o,c,polar_stereographic -a false_easting,mapping,o,d,0. -a false_northing,mapping,o,d,0. -a latitude_of_projection_origin,mapping,o,d,90. -a standard_parallel,mapping,o,d,70. -a straight_vertical_longitude_from_pole,mapping,o,d,-45. -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_nh_${period}.nc || { echo "ERROR ncatted $sdir/pism_nh_${period}.nc" ; exit 1 ; }
             elif [[ $submodel == "vilma" ]]; then
               if [[ "${chunks[${submodel}dec]}" == *" ${period: -1} "* ]]; then
-                ln -vsf $rawsdir/vilma_-$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_-$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
+                ln -vsf $rawsdir/vilma_?$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_?$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
               fi
             else
               ln -sf $rawsdir/*_${period}* $sdir/ 2>/dev/null 1>&2 || { echo "ERROR creating links for $period ${RAW_EXP_IDS[$y]} $submodel" && exit 1 ; }
diff --git a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p5f1-CR.runpp b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p5f1-CR.runpp
index f4e9ea9b3802caf4ebe24eb3442e9514a6bb4ce6..184c5727bdd50805dae4851f547a9c48e14a985f 100755
--- a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p5f1-CR.runpp
+++ b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p5f1-CR.runpp
@@ -426,15 +426,15 @@ function run_agg
 
             # Create softlinks to raw model output - PISM requires special treatment
             if [[ $submodel == "$icemod" ]]; then
-              #ln -sf $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
-              #ln -sf $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
-              cp -v $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
               ncatted -O -h -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_ant_${period}.nc || { echo "ERROR ncatted $sdir/pism_ant_${period}.nc" ; exit 1 ; }
-              cp -v $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
               ncatted -O -h -a ellipsoid,mapping,o,c,WGS84 -a grid_mapping_name,mapping,o,c,polar_stereographic -a false_easting,mapping,o,d,0. -a false_northing,mapping,o,d,0. -a latitude_of_projection_origin,mapping,o,d,90. -a standard_parallel,mapping,o,d,70. -a straight_vertical_longitude_from_pole,mapping,o,d,-45. -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_nh_${period}.nc || { echo "ERROR ncatted $sdir/pism_nh_${period}.nc" ; exit 1 ; }
             elif [[ $submodel == "vilma" ]]; then
               if [[ "${chunks[${submodel}dec]}" == *" ${period: -1} "* ]]; then
-                ln -vsf $rawsdir/vilma_-$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_-$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
+                ln -vsf $rawsdir/vilma_?$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_?$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
               fi
             else
               ln -sf $rawsdir/*_${period}* $sdir/ 2>/dev/null 1>&2 || { echo "ERROR creating links for $period ${RAW_EXP_IDS[$y]} $submodel" && exit 1 ; }
diff --git a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p6f1-CR.runpp b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p6f1-CR.runpp
index 0c33aa709c1c10701b9b563261dac897be61943a..f5b31a26b00d92b8186be15ba824bc75dde7212e 100755
--- a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p6f1-CR.runpp
+++ b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p6f1-CR.runpp
@@ -426,15 +426,15 @@ function run_agg
 
             # Create softlinks to raw model output - PISM requires special treatment
             if [[ $submodel == "$icemod" ]]; then
-              #ln -sf $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
-              #ln -sf $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
-              cp -v $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
               ncatted -O -h -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_ant_${period}.nc || { echo "ERROR ncatted $sdir/pism_ant_${period}.nc" ; exit 1 ; }
-              cp -v $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
               ncatted -O -h -a ellipsoid,mapping,o,c,WGS84 -a grid_mapping_name,mapping,o,c,polar_stereographic -a false_easting,mapping,o,d,0. -a false_northing,mapping,o,d,0. -a latitude_of_projection_origin,mapping,o,d,90. -a standard_parallel,mapping,o,d,70. -a straight_vertical_longitude_from_pole,mapping,o,d,-45. -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_nh_${period}.nc || { echo "ERROR ncatted $sdir/pism_nh_${period}.nc" ; exit 1 ; }
             elif [[ $submodel == "vilma" ]]; then
               if [[ "${chunks[${submodel}dec]}" == *" ${period: -1} "* ]]; then
-                ln -vsf $rawsdir/vilma_-$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_-$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
+                ln -vsf $rawsdir/vilma_?$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_?$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
               fi
             else
               ln -sf $rawsdir/*_${period}* $sdir/ 2>/dev/null 1>&2 || { echo "ERROR creating links for $period ${RAW_EXP_IDS[$y]} $submodel" && exit 1 ; }
diff --git a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p7f1-CR.runpp b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p7f1-CR.runpp
index 092cdd0ffe0ab4dd982dc8015c31f3ce0d00367f..d9548f8a0baa74bde97c585c244a6cceef5875cd 100755
--- a/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p7f1-CR.runpp
+++ b/cmor/mpiesm/scripts/transient-deglaciation-interactive_r1i1p7f1-CR.runpp
@@ -426,15 +426,15 @@ function run_agg
 
             # Create softlinks to raw model output - PISM requires special treatment
             if [[ $submodel == "$icemod" ]]; then
-              #ln -sf $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
-              #ln -sf $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
-              cp -v $rawsdir_pism_ant/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
+              #ln -sf $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_ant/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_ant_${period}.nc
               ncatted -O -h -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_ant_${period}.nc || { echo "ERROR ncatted $sdir/pism_ant_${period}.nc" ; exit 1 ; }
-              cp -v $rawsdir_pism_nh/pism_-$(printf "%06d" $((inv_chunk_year - 10)))/pism_-$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
+              cp -v $rawsdir_pism_nh/pism_?$(printf "%06d" $((inv_chunk_year - 10)))/pism_?$(printf "%06d" $((inv_chunk_year - 10))).nc $sdir/pism_nh_${period}.nc
               ncatted -O -h -a ellipsoid,mapping,o,c,WGS84 -a grid_mapping_name,mapping,o,c,polar_stereographic -a false_easting,mapping,o,d,0. -a false_northing,mapping,o,d,0. -a latitude_of_projection_origin,mapping,o,d,90. -a standard_parallel,mapping,o,d,70. -a straight_vertical_longitude_from_pole,mapping,o,d,-45. -a scale_factor_at_projection_origin,mapping,o,d,1.0 $sdir/pism_nh_${period}.nc || { echo "ERROR ncatted $sdir/pism_nh_${period}.nc" ; exit 1 ; }
             elif [[ $submodel == "vilma" ]]; then
               if [[ "${chunks[${submodel}dec]}" == *" ${period: -1} "* ]]; then
-                ln -vsf $rawsdir/vilma_-$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_-$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
+                ln -vsf $rawsdir/vilma_?$(printf "%06d" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc || echo "ERROR ln -vsf $rawsdir/vilma_?$(printf \"%06d\" $((inv_chunk_year - 10)))/rsl.nc $sdir/rsl_${period_bk}.nc"
               fi
             else
               ln -sf $rawsdir/*_${period}* $sdir/ 2>/dev/null 1>&2 || { echo "ERROR creating links for $period ${RAW_EXP_IDS[$y]} $submodel" && exit 1 ; }