From 4566d4b6c35f669548e327ce54566a821e6304c0 Mon Sep 17 00:00:00 2001 From: henrykironde Date: Tue, 23 Jan 2024 15:35:33 -0500 Subject: [PATCH] Update driver scripts --- archive_hipergator.sh | 5 ----- portal_dryrun_forecast.sh | 8 ++++---- portal_weekly_forecast.sh | 8 ++++---- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/archive_hipergator.sh b/archive_hipergator.sh index 93a27635..b6075ff4 100644 --- a/archive_hipergator.sh +++ b/archive_hipergator.sh @@ -17,11 +17,6 @@ git config user.name "Weecology Deploy Bot" # Commit changes to portal-forecasts repo git checkout main - -# zip forecasts files by data -echo "INFO [$(date "+%Y-%m-%d %H:%M:%S")] zipping forecasts files" -Rscript setup_forecasts_files.R zip - git add data/* models/* forecasts/* portal_weekly_forecast.sh portal_dryrun_forecast.sh git commit -m "Update forecasts: HiperGator Build $current_date [ci skip]" diff --git a/portal_dryrun_forecast.sh b/portal_dryrun_forecast.sh index b52e1481..9efec06e 100644 --- a/portal_dryrun_forecast.sh +++ b/portal_dryrun_forecast.sh @@ -3,11 +3,11 @@ #SBATCH --mail-user=portal-forecasts-aaaaamelbeyabgcqol6s4p4cja@weecology.slack.com #SBATCH --mail-type=FAIL #SBATCH --ntasks=1 -#SBATCH --mem=2gb +#SBATCH --mem=16gb #SBATCH --time=12:00:00 #SBATCH --partition=hpg2-compute -#SBATCH --output=portal_dryrun_forecast_log.out -#SBATCH --error=portal_dryrun_forecast_log.err +#SBATCH --output=/orange/ewhite/PortalForecasts/portal_dryrun_forecast_log.out +#SBATCH --error=/orange/ewhite/PortalForecasts/portal_dryrun_forecast_log.err echo "INFO: [$(date "+%Y-%m-%d %H:%M:%S")] Starting Weekly Forecast on $(hostname) in $(pwd)" @@ -24,7 +24,7 @@ git clone https://github.com/weecology/portal-forecasts.git cd portal-forecasts echo "INFO [$(date "+%Y-%m-%d %H:%M:%S")] Running Portal Forecasts" -singularity run ../portalcasting_latest.sif Rscript PortalForecasts_dryrun.R +singularity run ../portalcasting_latest.sif Rscript PortalForecasts_dryrun.R 2>&1 || exit 1 echo "INFO [$(date "+%Y-%m-%d %H:%M:%S")] Checking if forecasts were successful" # Redirect stderr(2) to stdout(1) if command fails, and exit script with 1 diff --git a/portal_weekly_forecast.sh b/portal_weekly_forecast.sh index 62cbc749..50913509 100644 --- a/portal_weekly_forecast.sh +++ b/portal_weekly_forecast.sh @@ -3,11 +3,11 @@ #SBATCH --mail-user=portal-forecasts-aaaaamelbeyabgcqol6s4p4cja@weecology.slack.com #SBATCH --mail-type=FAIL #SBATCH --ntasks=1 -#SBATCH --mem=2gb +#SBATCH --mem=16gb #SBATCH --time=12:00:00 #SBATCH --partition=hpg2-compute -#SBATCH --output=portal_weekly_forecast_log.out -#SBATCH --error=portal_weekly_forecast_log.err +#SBATCH --output=/orange/ewhite/PortalForecasts/portal_weekly_forecast_log.out +#SBATCH --error=/orange/ewhite/PortalForecasts/portal_weekly_forecast_log.err echo "INFO: [$(date "+%Y-%m-%d %H:%M:%S")] Starting Weekly Forecast on $(hostname) in $(pwd)" @@ -24,7 +24,7 @@ git clone https://github.com/weecology/portal-forecasts.git cd portal-forecasts echo "INFO [$(date "+%Y-%m-%d %H:%M:%S")] Running Portal Forecasts" -singularity run ../portalcasting_latest.sif Rscript PortalForecasts.R +singularity run ../portalcasting_latest.sif Rscript PortalForecasts.R 2>&1 || exit 1 echo "INFO [$(date "+%Y-%m-%d %H:%M:%S")] Checking if forecasts were successful" # Redirect stderr(2) to stdout(1) if command fails, and exit script with 1