Minor cleanups.

models/mitgcm/prepare-models-for-inspection.sh

@@ -39,32 +39,28 @@ for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*mitgcm*job'` ; do
 	information "  model $MODEL"
 	information "  mode $MODE"
 
-	SOURCE_LABEL="/home/hs/share/software/restructuring-experiments/architecture-recovery-and-optimization-data/$MODEL/$NAME/$MODE/$FORM"
+	cd "${JOB_DIRECTORY}"
 
-	cat template.project | sed "s/NAME/$NAME-original/g" > "${JOB_DIRECTORY}/original-model/.project"
-	rm -rf "${JOB_DIRECTORY}/original-model-fl"
-	mkdir "${JOB_DIRECTORY}/original-model-fl"
-	${RELABEL} -i "${JOB_DIRECTORY}/original-model" -o "${JOB_DIRECTORY}/original-model-fl" -r "$SOURCE_LABEL:original" -e "$NAME-original-fl"
+	if [ -f "med-output.csv" ] ; then
+		cat "${BASE_DIR}/template.project" | sed "s/NAME/$NAME-original/g" > "${JOB_DIRECTORY}/original-model/.project"
 
-	for J in `cat "${JOB_DIRECTORY}/med-output.csv" | sed 's/;/\t/g' | awk '{ print $3","$1","$2 }' | sed 's/^\([0-9],\)/00\1/'  | sed 's/^\([0-9]\{2\},\)/0\1/' | sort | head -5` ; do
+		for J in `cat "med-output.csv" | sed 's/;/\t/g' | awk '{ print $3","$1","$2 }' | sed 's/^\([0-9],\)/00\1/'  | sed 's/^\([0-9]\{2\},\)/0\1/' | sort` ; do
 			ORIGINAL=`echo "$J" | cut -d, -f2 | sed 's/"//g'`
 			OPTIMIZED=`echo "$J" | cut -d, -f3 | sed 's/"//g'`
 			STEPS=`echo "$J" | cut -d, -f1`
 
 			echo "$ORIGINAL -> $OPTIMIZED in $STEPS"
 
-		cat template.project | sed "s/NAME/$NAME-$OPTIMIZED/g" > "${JOB_DIRECTORY}/$OPTIMIZED/.project"
-		
-		rm -rf "${JOB_DIRECTORY}/${OPTIMIZED}-fl"
-		mkdir "${JOB_DIRECTORY}/${OPTIMIZED}-fl"
+			cat "${BASE_DIR}/template.project" | sed "s/NAME/${MODEL_ID}-$OPTIMIZED/g" > "${JOB_DIRECTORY}/$OPTIMIZED/.project"
 
 			rm -rf "${JOB_DIRECTORY}/merge-${OPTIMIZED}"
 			mkdir "${JOB_DIRECTORY}/merge-${OPTIMIZED}"
 
-		${RELABEL} -i "${JOB_DIRECTORY}/${OPTIMIZED}" -o "${JOB_DIRECTORY}/${OPTIMIZED}-fl" -r "$SOURCE_LABEL:$OPTIMIZED" -e "$NAME-$OPTIMIZED-fl"
-		
-		${MOP} -e $NAME-$OPTIMIZED-merged -i "${JOB_DIRECTORY}/original-model-fl" "${JOB_DIRECTORY}/${OPTIMIZED}-fl" -o "${JOB_DIRECTORY}/merge-${OPTIMIZED}" -s all merge
+			${MOP} -e ${MODEL_ID}-$OPTIMIZED-merged -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge
 		done
+	else
+		error "Missing MED output for job $BASENAME"
+	fi
 done
 
 # end

models/uvic/prepare-models-for-inspection.sh

@@ -19,7 +19,7 @@ checkDirectory "Result directory" "${OPTIMIZATION_DATA}"
 
 # main
 for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*uvic*job'` ; do
-	BASENAME=`basename $JOB_DIRECTORY`
+	BASENAME=`basename "${JOB_DIRECTORY}"`
 	information "----------------------------------------"
 	information $BASENAME
 	information "----------------------------------------"
@@ -42,7 +42,6 @@ for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*uvic*job'` ; do
 	cd "${JOB_DIRECTORY}"
 
 	if [ -f "med-output.csv" ] ; then
-
 		cat "${BASE_DIR}/template.project" | sed "s/NAME/$NAME-original/g" > "${JOB_DIRECTORY}/original-model/.project"
 
 		for J in `cat "med-output.csv" | sed 's/;/\t/g' | awk '{ print $3","$1","$2 }' | sed 's/^\([0-9],\)/00\1/'  | sed 's/^\([0-9]\{2\},\)/0\1/' | sort` ; do