Skip to content

Commit

Permalink
temp fix to hardcoded crop outfile path
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewphilipsmith committed Sep 20, 2024
1 parent 37e7666 commit 16da6d3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
14 changes: 7 additions & 7 deletions bash/run-pipeline-iteratively.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ output_path="/datadrive/clim-recal-results/group_run_`date +%F-%H-%M`"

# Other values used in local development
# hads_input_path="/Volumes/vmfileshare/ClimateData/Raw/HadsUKgrid"
hads_input_path="$script_dir/example_files/HadsUKgrid"
# hads_input_path="$script_dir/example_files/HadsUKgrid"
# cpm_input_path="/Volumes/vmfileshare/ClimateData/Raw/UKCP2.2"
cpm_input_path="$script_dir/example_files/UKCP2.2"
output_path="$script_dir/clim-recal-results/group_run_`date +%F-%H-%M`"
# cpm_input_path="$script_dir/example_files/UKCP2.2"
# output_path="$script_dir/clim-recal-results/group_run_`date +%F-%H-%M`"

log_path="$output_path/logs"

Expand All @@ -31,8 +31,8 @@ mkdir -p $log_path


cpm_start_year=1980
# cpm_end_year=2079
cpm_end_year=1982
cpm_end_year=2079
# cpm_end_year=1982

# First and last year that we have CPM data for
for year in $(seq $cpm_start_year $cpm_end_year); do
Expand Down Expand Up @@ -68,11 +68,11 @@ for year in $(seq $cpm_start_year $cpm_end_year); do
$hads_working_dir

{
echo "clim-recal \
clim-recal \
--hads-input-path $hads_working_dir \
--cpm-input-path $cpm_working_dir \
--output-path $output_path \
--execute"
--execute
} 2>&1 | tee $log_path/log_$year.txt

done
1 change: 1 addition & 0 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ services:
- JUPYTER_ENABLE_LAB=yes
volumes:
- .:/home/jovyan:rw
- /datadrive:/datadrive

docs:
build:
Expand Down
7 changes: 4 additions & 3 deletions python/clim_recal/resample.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,10 @@

CFCalendarSTANDARD: Final[str] = "standard"

RESAMPLING_OUTPUT_PATH: Final[PathLike] = (
CLIMATE_DATA_MOUNT_PATH / "CPM-365/andys-two-gdal-step-approach/resample"
)
# RESAMPLING_OUTPUT_PATH: Final[PathLike] = (
# CLIMATE_DATA_MOUNT_PATH / "CPM-365/andys-two-gdal-step-approach/resample"
#)
RESAMPLING_OUTPUT_PATH: Final[PathLike] = "/datadrive/clim-recal-results/cropped"
RAW_HADS_PATH: Final[PathLike] = CLIMATE_DATA_MOUNT_PATH / "Raw/HadsUKgrid"
RAW_CPM_PATH: Final[PathLike] = CLIMATE_DATA_MOUNT_PATH / "Raw/UKCP2.2"
RAW_HADS_TASMAX_PATH: Final[PathLike] = RAW_HADS_PATH / "tasmax/day"
Expand Down

0 comments on commit 16da6d3

Please sign in to comment.