Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ This work is a continuation, and nf-core port, of the [original version of this

### `Added`

- [24](https://github.com/nf-core/rangeland/pull/24) Update to FORCE version 3.8.01

### `Fixed`

### `Dependencies`
Expand Down
2 changes: 1 addition & 1 deletion modules/local/force-generate_analysis_mask/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process FORCE_GENERATE_ANALYSIS_MASK{
tag { aoi.simpleName }
label 'process_single'

container "docker.io/davidfrantz/force:3.7.10"
container "nf-core/force:3.8.01"

input:
path aoi
Expand Down
4 changes: 2 additions & 2 deletions modules/local/force-generate_tile_allow_list/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process FORCE_GENERATE_TILE_ALLOW_LIST{
tag { aoi.simpleName }
label 'process_single'

container "docker.io/davidfrantz/force:3.7.10"
container "nf-core/force:3.8.01"

input:
path aoi
Expand All @@ -18,7 +18,7 @@ process FORCE_GENERATE_TILE_ALLOW_LIST{

script:
"""
force-tile-extent $aoi tmp/ tile_allow.txt
force-tile-extent -d tmp/ -a tile_allow.txt $aoi
rm -r tmp

cat <<-END_VERSIONS > versions.yml
Expand Down
3 changes: 2 additions & 1 deletion modules/local/force-higher_level/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ process FORCE_HIGHER_LEVEL {
label 'process_medium'
label 'error_retry'

container "docker.io/davidfrantz/force:3.7.10"
container "nf-core/force:3.8.01"

input:
tuple val(tile), path(config), path(ard), path(aoi), path (datacube), path (endmember)
Expand All @@ -24,6 +24,7 @@ process FORCE_HIGHER_LEVEL {
# set provenance directory
mkdir prov
sed -i "/^DIR_PROVENANCE /c\\DIR_PROVENANCE = prov/" \$PARAM
sed -i "/^INTERPOLATE /c\\INTERPOLATE = RBF" \$PARAM

# higher level processing
force-higher-level \$PARAM
Expand Down
2 changes: 1 addition & 1 deletion modules/local/force-mosaic/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process FORCE_MOSAIC{
tag { product }
label 'process_low'

container "docker.io/davidfrantz/force:3.7.10"
container "nf-core/force:3.8.01"

input:
tuple val(product), path('trend/*')
Expand Down
2 changes: 1 addition & 1 deletion modules/local/force-preprocess/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ process FORCE_PREPROCESS {
label 'process_medium'
label 'error_retry'

container "docker.io/davidfrantz/force:3.7.10"
container "nf-core/force:3.8.01"

input:
tuple path(conf), path(data), path(cube), path(tile), path(dem), path(wvdb)
Expand Down
2 changes: 1 addition & 1 deletion modules/local/force-pyramid/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ process FORCE_PYRAMID {
tag { tile }
label 'process_low'

container "docker.io/davidfrantz/force:3.7.10"
container "nf-core/force:3.8.01"

input:
tuple val(tile), path(image)
Expand Down
2 changes: 1 addition & 1 deletion modules/local/higher_level_force_config/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ process HIGHER_LEVEL_CONFIG {
label 'process_single'
label 'error_retry'

container "docker.io/davidfrantz/force:3.7.10"
container "nf-core/force:3.8.01"

input:
tuple val(tile), path("ard/${tile}/*"), path("ard/${tile}/*"), path("mask/${tile}/aoi.tif")
Expand Down
2 changes: 1 addition & 1 deletion modules/local/merge/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ process MERGE {
label 'process_low'
label 'error_retry'

container "docker.io/davidfrantz/force:3.7.10"
container "nf-core/force:3.8.01"

input:
val (data_type) // defines whether qai or boa is merged
Expand Down
2 changes: 1 addition & 1 deletion modules/local/preprocess_force_config/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ process PREPROCESS_CONFIG {
label 'process_single'
label 'error_retry'

container "docker.io/davidfrantz/force:3.7.10"
container "nf-core/force:3.8.01"

input:
path data
Expand Down
1,462 changes: 731 additions & 731 deletions tests/default.nf.test.snap

Large diffs are not rendered by default.

902 changes: 455 additions & 447 deletions tests/tweaked_params.nf.test.snap

Large diffs are not rendered by default.