diff --git a/runs/hindcasts/templates/hindcast/01-run.sh b/runs/hindcasts/templates/hindcast/01-run.sh index baf08ee..122579e 100755 --- a/runs/hindcasts/templates/hindcast/01-run.sh +++ b/runs/hindcasts/templates/hindcast/01-run.sh @@ -1,5 +1,7 @@ #!/bin/bash +OUTDIR=$1 + . ./99-post_funcs.sh --source-only STARTSEC=`date +%s` @@ -14,9 +16,9 @@ FIRE_NAME=`echo $LOCAL_SCRATCH | rev | cut -d/ -f1 | rev | cut -d_ -f1` DATE_START=`echo $LOCAL_SCRATCH | rev | cut -d/ -f1 | rev | cut -d_ -f2` TIME_START=`echo $LOCAL_SCRATCH | rev | cut -d/ -f1 | rev | cut -d_ -f3` TIMESTAMP_START="${DATE_START}_${TIME_START}" -HINDCAST_DIR=$ELMFIRE_BASE_DIR/runs/hindcasts/runs/$FIRE_NAME/${FIRE_NAME}_$TIMESTAMP_START -rm -f -r $HINDCAST_DIR -mkdir -p $HINDCAST_DIR 2> /dev/null +#HINDCAST_DIR=$ELMFIRE_BASE_DIR/runs/hindcasts/runs/$FIRE_NAME/${FIRE_NAME}_$TIMESTAMP_START +#rm -f -r $HINDCAST_DIR +#mkdir -p $HINDCAST_DIR 2> /dev/null SOCKETS=`lscpu | grep 'Socket(s)' | cut -d: -f2 | xargs` CORES_PER_SOCKET=`lscpu | grep 'Core(s) per socket' | cut -d: -f2 | xargs` @@ -32,8 +34,8 @@ progress_message "Postprocessing complete, cleaning up" rm -f *.aux.xml *.bsq *.hdr *.aux.xml -cp -f -r * $HINDCAST_DIR -cd $HINDCAST_DIR +#cp -f -r * $HINDCAST_DIR +#cd $HINDCAST_DIR progress_message "Calculating fitness" ./04-fitness.sh >& fitness.log @@ -49,6 +51,11 @@ done mv active* ./fuel/ 2> /dev/null mv already* ./fuel/ 2> /dev/null +rm -f -r $OUTDIR +mkdir -p $OUTDIR + +cp -f -r * $OUTDIR +cd $OUTDIR rm -f -r $LOCAL_SCRATCH ENDSEC=`date +%s`