diff --git a/models/mitgcm/prepare-models-for-inspection.sh b/models/mitgcm/prepare-models-for-inspection.sh index 4d954cc7c1c03d62ed43e9e11bd87ff1f75c9834..bbe646c2203f7f0663698ab0ea8461db49cfd236 100755 --- a/models/mitgcm/prepare-models-for-inspection.sh +++ b/models/mitgcm/prepare-models-for-inspection.sh @@ -56,7 +56,7 @@ for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*mitgcm*job'` ; do rm -rf "merge-${OPTIMIZED}" mkdir "merge-${OPTIMIZED}" - "${MOP}" -e "${MODEL_ID}-$OPTIMIZED-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge >> mop.log 2>&1 + "${MOP}" -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge >> mop.log 2>&1 done else error "Missing MED output for job $BASENAME" diff --git a/models/uvic/prepare-models-for-inspection.sh b/models/uvic/prepare-models-for-inspection.sh index 29776f6476fb365416e8bd7b822a2f326fd6c4b8..0d5b37126486b822729b060fea36e163a412d02a 100755 --- a/models/uvic/prepare-models-for-inspection.sh +++ b/models/uvic/prepare-models-for-inspection.sh @@ -42,7 +42,7 @@ 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" + cat "${BASE_DIR}/template.project" | sed "s/NAME/$NAME-original/g" > "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 ORIGINAL=`echo "$J" | cut -d, -f2 | sed 's/"//g'` @@ -51,12 +51,12 @@ for JOB_DIRECTORY in `find "${OPTIMIZATION_DATA}/jss"* -name '*uvic*job'` ; do echo "$ORIGINAL -> $OPTIMIZED in $STEPS" - cat "${BASE_DIR}/template.project" | sed "s/NAME/${MODEL_ID}-$OPTIMIZED/g" > "${JOB_DIRECTORY}/$OPTIMIZED/.project" + cat "${BASE_DIR}/template.project" | sed "s/NAME/${MODEL_ID}-$OPTIMIZED/g" > "$OPTIMIZED/.project" - rm -rf "${JOB_DIRECTORY}/merge-${OPTIMIZED}" - mkdir "${JOB_DIRECTORY}/merge-${OPTIMIZED}" + rm -rf "merge-${OPTIMIZED}" + mkdir "merge-${OPTIMIZED}" - "${MOP}" -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge + "${MOP}" -e "${MODEL_ID}-${OPTIMIZED}-merged" -i "original-model" "${OPTIMIZED}" -o "merge-${OPTIMIZED}" -s all merge >> mop.log 2>&1 done else error "Missing MED output for job $BASENAME"