Merge remote-tracking branch 'origin/v9-minor'

check/run.sh

@@ -70,26 +70,12 @@ function cleanup {
 # ensure TMPFILE is deleted and results are copied when exiting (normally or due to abort/interrupt)
 trap cleanup EXIT
 
-# only wait for optimi to be mounted in run.sh if you are on a recognized computer at zib
-OPTHOST=$(uname -n | sed 's/.zib.de//g' | sed 's/portal//g' | tr -cd '[:alpha:]')
-
-# file on optimi to check for
-case "$OPTHOST" in
-  opt | optc )
-    . /etc/os-release
-    case "$ID" in
-      debian ) OPTIMIFILE=/data/optimi/optimi/QUOTAS ;;
-      ubuntu ) OPTIMIFILE=/nfs/optimi/QUOTAS ;;
-    esac
-    ;;
-  htccmp     ) OPTIMIFILE=/data/optimi/optimi/QUOTAS ;;
-esac
-
-# check if the scripts runs a *.zib.de host and we have recognized the host (OPTIMIFILE being set)
-if $(hostname -f | grep -q zib.de) && [ -n "$OPTIMIFILE" ];
+# check if the scripts runs a *.zib.de host
+if $(hostname -f | grep -q zib.de)
 then
     # access optimi once to force a mount
-    ls ${OPTIMIFILE} >/dev/null 2>&1
+    OPTIMIFILE=/data/optimi/optimi/kombadon/IP/miplib2003/10teams.mps.gz
+    ls $OPTIMIFILE >/dev/null 2>&1
 
     # check if optimi is mounted
     MOUNTED=0
@@ -110,7 +96,7 @@ then
             MOUNTED=1
         else
             ((FAILED++))
-            echo "optimi is not mounted yet, waiting 1 second" >> "${ERRFILE}"
+            echo "optimi is not mounted yet ($OPTIMIFILE is no file), waiting 1 second" >> "${ERRFILE}"
             sleep 1
         fi
     done

check/run_fscip.sh

@@ -83,25 +83,11 @@ function cleanup {
 # ensure TMPFILE is deleted and results are copied when exiting (normally or due to abort/interrupt)
 trap cleanup EXIT
 
-# only wait for optimi to be mounted in run.sh if you are on an opt computer at zib
-OPTHOST=$(uname -n | sed 's/.zib.de//g' | sed 's/portal//g' | tr -cd '[:alpha:]')
-
 # check if the scripts runs a *.zib.de host
-if $(hostname -f | grep -q zib.de) && $([[ "${OPTHOST}" == "opt" ]] || [[ "${OPTHOST}" == "optc" ]]);
+if $(hostname -f | grep -q zib.de)
 then
-    # file on optimi to check for
-    case "$OPTHOST" in
-      opt | optc )
-        . /etc/os-release
-        case "$ID" in
-          debian ) OPTIMIFILE=/data/optimi/optimi/QUOTAS ;;
-          ubuntu ) OPTIMIFILE=/nfs/optimi/QUOTAS ;;
-        esac
-        ;;
-      htccmp     ) OPTIMIFILE=/data/optimi/optimi/QUOTAS ;;
-    esac
-
-    # access /optimi once to force a mount
+    # access optimi once to force a mount
+    OPTIMIFILE=/data/optimi/optimi/kombadon/IP/miplib2003/10teams.mps.gz
     ls $OPTIMIFILE >/dev/null 2>&1
 
     # check if /optimi is mounted
@@ -123,7 +109,7 @@ then
             MOUNTED=1
         else
             ((FAILED++))
-            echo "/optimi is not mounted yet, waiting 1 second"
+            echo "optimi is not mounted yet ($OPTIMIFILE is no file), waiting 1 second"
             sleep 1
         fi
     done

pclint/scip.lnt

@@ -122,6 +122,7 @@
 -emacro(530,va_*)
 -ecall(530,vsnprintf)
 -emacro(530,SCIPalloc*)
+-emacro(530,SCIPduplicate*)
 
 // ignoring return value of function
 -esym(534,printf,fprintf,fclose,fputs,fputc,fseek,fflush,strcat,strcpy,SCIPfclose,SCIPfseek,memset,memcpy,memmove)