Increment version to 2025.0129

lautenberger · Jan 29, 2025 · 2d68d31 · 2d68d31
1 parent 7c679c8
commit 2d68d31
Show file tree

Hide file tree

Showing 35 changed files with 35 additions and 35 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -39,7 +39,7 @@ RUN apt-get purge -y build-essential && \
 
 WORKDIR /elmfire
 
-ENV ELMFIRE_VER=2025.0125
+ENV ELMFIRE_VER=2025.0129
 ENV ELMFIRE_BASE_DIR=/elmfire/elmfire
 ENV ELMFIRE_SCRATCH_BASE=/scratch/elmfire
 ENV ELMFIRE_INSTALL_DIR=$ELMFIRE_BASE_DIR/build/linux/bin

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
@@ -39,7 +39,7 @@ RUN apt-get purge -y build-essential && \
 
 WORKDIR /
 
-ENV ELMFIRE_VER=2025.0125
+ENV ELMFIRE_VER=2025.0129
 ENV ELMFIRE_BASE_DIR=/elmfire/elmfire
 ENV ELMFIRE_SCRATCH_BASE=/scratch/elmfire
 ENV ELMFIRE_INSTALL_DIR=$ELMFIRE_BASE_DIR/build/linux/bin

diff --git a/build/linux/make_gnu.sh b/build/linux/make_gnu.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # ELMFIRE version:
-ELMFIRE_VER=2025.0125
+ELMFIRE_VER=2025.0129
 
 # ELMFIRE uses several environment variables for compilation. If the default
 # values specified on lines 14 - 16 below are not appropriate for your system,

diff --git a/build/linux/make_intel.sh b/build/linux/make_intel.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # ELMFIRE version:
-ELMFIRE_VER=2025.0125
+ELMFIRE_VER=2025.0129
 
 # ELMFIRE uses several environment variables for compilation. If the default
 # values specified on lines 14 - 16 below are not appropriate for your system,

diff --git a/build/source/elmfire.f90 b/build/source/elmfire.f90
@@ -29,7 +29,7 @@ PROGRAM ELMFIRE
 
 CHARACTER(3) :: THREE_IWX_BAND
 CHARACTER(4) :: FOUR_IWX_BAND
-CHARACTER(60) :: VERSIONSTRING='ELMFIRE 2025.0125'
+CHARACTER(60) :: VERSIONSTRING='ELMFIRE 2025.0129'
 CHARACTER(400) :: FN, MESSAGESTR
 
 TYPE (RASTER_TYPE), POINTER :: R

diff --git a/docs/conf.py b/docs/conf.py
@@ -9,7 +9,7 @@
 project = 'ELMFIRE'
 copyright = '2025, Chris Lautenberger'
 author = 'Chris Lautenberger'
-release = '2025.0125'
+release = '2025.0129'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

diff --git a/runs/forecasts.ak/templates/active_fires-suppressed/01-run.sh b/runs/forecasts.ak/templates/active_fires-suppressed/01-run.sh
@@ -7,7 +7,7 @@ STARTSEC=`date +%s`
 progress_message "Start"
 
 LOCAL_SCRATCH=$(pwd)
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
 ELMFIRE=$ELMFIRE_INSTALL_DIR/elmfire_$ELMFIRE_VER
 FIRE_NAME=`echo $LOCAL_SCRATCH | rev | cut -d/ -f1 | rev | cut -d_ -f1`

diff --git a/runs/forecasts.ak/templates/active_fires-suppressed/02-postprocess.sh b/runs/forecasts.ak/templates/active_fires-suppressed/02-postprocess.sh
@@ -17,7 +17,7 @@ GEOSERVER_INCOMINGDIR="${GEOSERVER_INCOMINGDIR:-/incoming}"
 OWNERSHIP="${OWNERSHIP:-'elmfire:domain users'}"
 BUFFER_SCRIPT=$ELMFIRE_BASE_DIR/etc/buffer.py
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 HRS_IN_FORECAST[7]=168  # 7-day forecast
 HRS_IN_FORECAST[14]=336 #14-day forecast

diff --git a/runs/forecasts.ak/templates/active_fires-suppressed/20-firemap.sh b/runs/forecasts.ak/templates/active_fires-suppressed/20-firemap.sh
@@ -59,7 +59,7 @@ function unsetnodata {
 CWD=$(pwd)
 DATADIR=$CWD
 NPARALLEL=128
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_POST=$ELMFIRE_BASE_DIR/build/linux/bin/elmfire_post_$ELMFIRE_VER
 HOURS=`seq 1 120`
 SCRATCH=$CLOUDFIRE_SCRATCH_BASE/wifire_probabilistic

diff --git a/runs/forecasts.ak/templates/active_fires/01-run.sh b/runs/forecasts.ak/templates/active_fires/01-run.sh
@@ -7,7 +7,7 @@ STARTSEC=`date +%s`
 progress_message "Start"
 
 LOCAL_SCRATCH=$(pwd)
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
 ELMFIRE=$ELMFIRE_INSTALL_DIR/elmfire_$ELMFIRE_VER
 FIRE_NAME=`echo $LOCAL_SCRATCH | rev | cut -d/ -f1 | rev | cut -d_ -f1`

diff --git a/runs/forecasts.ak/templates/active_fires/02-postprocess.sh b/runs/forecasts.ak/templates/active_fires/02-postprocess.sh
@@ -17,7 +17,7 @@ GEOSERVER_INCOMINGDIR="${GEOSERVER_INCOMINGDIR:-/incoming}"
 OWNERSHIP="${OWNERSHIP:-'elmfire:domain users'}"
 BUFFER_SCRIPT=$ELMFIRE_BASE_DIR/etc/buffer.py
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 HRS_IN_FORECAST[7]=168  # 7-day forecast
 HRS_IN_FORECAST[14]=336 #14-day forecast

diff --git a/runs/forecasts.ak/templates/active_fires/20-firemap.sh b/runs/forecasts.ak/templates/active_fires/20-firemap.sh
@@ -59,7 +59,7 @@ function unsetnodata {
 CWD=$(pwd)
 DATADIR=$CWD
 NPARALLEL=128
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_POST=$ELMFIRE_BASE_DIR/build/linux/bin/elmfire_post_$ELMFIRE_VER
 HOURS=`seq 1 120`
 SCRATCH=$CLOUDFIRE_SCRATCH_BASE/wifire_probabilistic

diff --git a/runs/forecasts/templates/active_fires-suppressed/01-run.sh b/runs/forecasts/templates/active_fires-suppressed/01-run.sh
@@ -7,7 +7,7 @@ STARTSEC=`date +%s`
 progress_message "Start"
 
 LOCAL_SCRATCH=$(pwd)
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
 ELMFIRE=$ELMFIRE_INSTALL_DIR/elmfire_$ELMFIRE_VER
 FIRE_NAME=`echo $LOCAL_SCRATCH | rev | cut -d/ -f1 | rev | cut -d_ -f1`

diff --git a/runs/forecasts/templates/active_fires-suppressed/02-postprocess.sh b/runs/forecasts/templates/active_fires-suppressed/02-postprocess.sh
@@ -17,7 +17,7 @@ GEOSERVER_INCOMINGDIR="${GEOSERVER_INCOMINGDIR:-/incoming}"
 OWNERSHIP="${OWNERSHIP:-'elmfire:domain users'}"
 BUFFER_SCRIPT=$ELMFIRE_BASE_DIR/etc/buffer.py
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 HRS_IN_FORECAST[7]=168  # 7-day forecast
 HRS_IN_FORECAST[14]=336 #14-day forecast

diff --git a/runs/forecasts/templates/active_fires-suppressed/20-firemap.sh b/runs/forecasts/templates/active_fires-suppressed/20-firemap.sh
@@ -59,7 +59,7 @@ function unsetnodata {
 CWD=$(pwd)
 DATADIR=$CWD
 NPARALLEL=128
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_POST=$ELMFIRE_BASE_DIR/build/linux/bin/elmfire_post_$ELMFIRE_VER
 HOURS=`seq 1 120`
 SCRATCH=$CLOUDFIRE_SCRATCH_BASE/wifire_probabilistic

diff --git a/runs/forecasts/templates/active_fires/01-run.sh b/runs/forecasts/templates/active_fires/01-run.sh
@@ -7,7 +7,7 @@ STARTSEC=`date +%s`
 progress_message "Start"
 
 LOCAL_SCRATCH=$(pwd)
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
 ELMFIRE=$ELMFIRE_INSTALL_DIR/elmfire_$ELMFIRE_VER
 FIRE_NAME=`echo $LOCAL_SCRATCH | rev | cut -d/ -f1 | rev | cut -d_ -f1`

diff --git a/runs/forecasts/templates/active_fires/02-postprocess.sh b/runs/forecasts/templates/active_fires/02-postprocess.sh
@@ -17,7 +17,7 @@ GEOSERVER_INCOMINGDIR="${GEOSERVER_INCOMINGDIR:-/incoming}"
 OWNERSHIP="${OWNERSHIP:-'elmfire:domain users'}"
 BUFFER_SCRIPT=$ELMFIRE_BASE_DIR/etc/buffer.py
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 HRS_IN_FORECAST[7]=168  # 7-day forecast
 HRS_IN_FORECAST[14]=336 #14-day forecast

diff --git a/runs/forecasts/templates/active_fires/20-firemap.sh b/runs/forecasts/templates/active_fires/20-firemap.sh
@@ -59,7 +59,7 @@ function unsetnodata {
 CWD=$(pwd)
 DATADIR=$CWD
 NPARALLEL=128
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_POST=$ELMFIRE_BASE_DIR/build/linux/bin/elmfire_post_$ELMFIRE_VER
 HOURS=`seq 1 120`
 SCRATCH=$CLOUDFIRE_SCRATCH_BASE/wifire_probabilistic

diff --git a/runs/forecasts/templates/default/01-run.sh b/runs/forecasts/templates/default/01-run.sh
@@ -7,7 +7,7 @@ STARTSEC=`date +%s`
 progress_message "Start"
 
 LOCAL_SCRATCH=$(pwd)
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
 ELMFIRE=$ELMFIRE_INSTALL_DIR/elmfire_$ELMFIRE_VER
 FIRE_NAME=`echo $LOCAL_SCRATCH | rev | cut -d/ -f1 | rev | cut -d_ -f1`

diff --git a/runs/forecasts/templates/default/02-postprocess.sh b/runs/forecasts/templates/default/02-postprocess.sh
@@ -13,7 +13,7 @@ GEOSERVER_INCOMINGDIR="${GEOSERVER_INCOMINGDIR:-/incoming}"
 OWNERSHIP="${OWNERSHIP:-'elmfire:domain users'}"
 BUFFER_SCRIPT=$ELMFIRE_BASE_DIR/etc/buffer.py
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 HRS_IN_FORECAST[7]=168  # 7-day forecast
 HRS_IN_FORECAST[14]=336 #14-day forecast

diff --git a/runs/forecasts/templates/kubernetes/01-run.sh b/runs/forecasts/templates/kubernetes/01-run.sh
@@ -7,7 +7,7 @@ STARTSEC=`date +%s`
 progress_message "Start"
 
 LOCAL_SCRATCH=$(pwd)
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE=/elmfire/elmfire/build/linux/bin/elmfire_$ELMFIRE_VER
 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`

diff --git a/runs/forecasts/templates/kubernetes/02-postprocess.sh b/runs/forecasts/templates/kubernetes/02-postprocess.sh
@@ -14,7 +14,7 @@ GEOSERVER_INCOMINGDIR="${GEOSERVER_INCOMINGDIR:-/incoming}"
 OWNERSHIP="${OWNERSHIP:-'elmfire:domain users'}"
 BUFFER_SCRIPT=$ELMFIRE_BASE_DIR/etc/buffer.py
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 HRS_IN_FORECAST[7]=168  # 7-day forecast
 HRS_IN_FORECAST[14]=336 #14-day forecast

diff --git a/runs/hindcasts/templates/hindcast/01-run.sh b/runs/hindcasts/templates/hindcast/01-run.sh
@@ -7,7 +7,7 @@ STARTSEC=`date +%s`
 progress_message "Start"
 
 LOCAL_SCRATCH=$(pwd)
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
 ELMFIRE=$ELMFIRE_INSTALL_DIR/elmfire_$ELMFIRE_VER
 FIRE_NAME=`echo $LOCAL_SCRATCH | rev | cut -d/ -f1 | rev | cut -d_ -f1`

diff --git a/runs/hindcasts/templates/hindcast10m/01-run.sh b/runs/hindcasts/templates/hindcast10m/01-run.sh
@@ -7,7 +7,7 @@ STARTSEC=`date +%s`
 progress_message "Start"
 
 LOCAL_SCRATCH=$(pwd)
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
 ELMFIRE=$ELMFIRE_INSTALL_DIR/elmfire_$ELMFIRE_VER
 FIRE_NAME=`echo $LOCAL_SCRATCH | rev | cut -d/ -f1 | rev | cut -d_ -f1`

diff --git a/runs/hindcasts/templates/hindcast10m/02-elmfire_post.sh b/runs/hindcasts/templates/hindcast10m/02-elmfire_post.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CWD=$(pwd)
-ELMFIRE_POST=/home/clauten/elmfire/build/linux/bin/elmfire_post_2025.0125
+ELMFIRE_POST=/home/clauten/elmfire/build/linux/bin/elmfire_post_2025.0129
 NPARALLEL=32
 QUANTITIES='crown-fire flame-length spread-rate time-of-arrival'
 

diff --git a/runs/potential/01-calc_fire_potential.sh b/runs/potential/01-calc_fire_potential.sh
@@ -29,7 +29,7 @@ COMPLETE_LOG_PART1=$CWD/log/complete_part1.txt
 COMPLETE_LOG_PART2=$CWD/log/complete_part2.txt
 COMPLETE_LOG=$CWD/log/complete_part$PART.txt
 
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
 ELMFIRE=$ELMFIRE_INSTALL_DIR/elmfire_$ELMFIRE_VER
 

diff --git a/runs/risk/template/empty_run/01-run.sh b/runs/risk/template/empty_run/01-run.sh
@@ -6,7 +6,7 @@ FORECAST_CYCLE=$3
 TILE=$4
 OUTDIR=$ELMFIRE_BASE_DIR/runs/risk/runs/$FORECAST_CYCLE-$PATTERN-$FUELS_INPUTS/$TILE
 
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 ELMFIRE_INSTALL_DIR=${ELMFIRE_INSTALL_DIR:-$ELMFIRE_BASE_DIR/build/linux/bin}
 ELMFIRE=$ELMFIRE_INSTALL_DIR/elmfire_$ELMFIRE_VER
 TIMEOUT=3600

diff --git a/tutorials/01-constant-wind/01-run.sh b/tutorials/01-constant-wind/01-run.sh
@@ -31,7 +31,7 @@ A_SRS="EPSG: 32610" # Spatial reference system - UTM Zone 10
 
 # End inputs specification
 
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 . ../functions/functions.sh
 

diff --git a/tutorials/02-transient-wind/01-run.sh b/tutorials/02-transient-wind/01-run.sh
@@ -26,7 +26,7 @@ WX_INPUTS_FILE=wx.csv
 
 # End inputs specification
 
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 . ../functions/functions.sh
 

diff --git a/tutorials/03-real-fuels/01-run.sh b/tutorials/03-real-fuels/01-run.sh
@@ -12,7 +12,7 @@ WX_INPUTS_FILE=wx.csv
 
 # End specifing inputs - no need to edit from here down
 
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 . ../functions/functions.sh
 

diff --git a/tutorials/04-fire-potential/01-run.sh b/tutorials/04-fire-potential/01-run.sh
@@ -9,7 +9,7 @@ $ELMFIRE_BASE_DIR/cloudfire/fuel_wx_ign.py \
 
 WX_INPUTS_FILE=wx.csv
 
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 . ../functions/functions.sh
 

diff --git a/tutorials/05-UMD-spotting/01-run.sh b/tutorials/05-UMD-spotting/01-run.sh
@@ -6,7 +6,7 @@ CELLSIZE=30.0 # Grid size in meters
 
 # End inputs specification
 
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 SCRATCH=./scratch
 INPUTS=./inputs

diff --git a/verification/01-elliptical-shape/03-run-elmfire.sh b/verification/01-elliptical-shape/03-run-elmfire.sh
@@ -31,7 +31,7 @@ A_SRS="EPSG: 32610" # Spatial reference system - UTM Zone 10
 
 # End inputs specification
 
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 . ../../tutorials/functions/functions.sh
 

diff --git a/verification/02-crown-fire/03-run-elmfire.sh b/verification/02-crown-fire/03-run-elmfire.sh
@@ -31,7 +31,7 @@ A_SRS="EPSG: 32610" # Spatial reference system - UTM Zone 10
 
 # End inputs specification
 
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 . ../../tutorials/functions/functions.sh
 

diff --git a/verification/03-spotting/01-run.sh b/verification/03-spotting/01-run.sh
@@ -6,7 +6,7 @@ CELLSIZE=30.0 # Grid size in meters
 
 # End inputs specification
 
-ELMFIRE_VER=${ELMFIRE_VER:-2025.0125}
+ELMFIRE_VER=${ELMFIRE_VER:-2025.0129}
 
 SCRATCH=./scratch
 INPUTS=./inputs