Merge branch 'main' into feature/DEI-243-update-docs-without-anaconda

Deltares · Oct 4, 2024 · 0ec3a0c · 0ec3a0c
2 parents 9f87389 + 661dd38
commit 0ec3a0c
Show file tree

Hide file tree

Showing 99 changed files with 49 additions and 49 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "decoimpact"
-version = "0.5.13"
+version = "0.5.14"
 description = "A Python based kernel to perform spatial (environmental) impact assessment. Based on knowledge rules applied to model output and/or measurements."
 authors = ["Deltares"]
 readme = "README.md"

diff --git a/template_input.yaml b/template_input.yaml
@@ -1,4 +1,4 @@
-version: 0.5.13
+version: 0.5.14
 
 input-data:
   - dataset:

diff --git a/...iles/test1_default_independent_rules.yaml → ...l_files/01_default_independent_rules.yaml b/...iles/test1_default_independent_rules.yaml → ...l_files/01_default_independent_rules.yaml
@@ -23,5 +23,5 @@ rules:
       output_variable: new_water_level
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test1_default_independent_rules.nc
+  filename: ./tests_acceptance/output_nc_files/01_default_independent_rules.nc
 
diff --git a/.../test1b_multiply_rule_time_dependent.yaml → ...les/01b_multiply_rule_time_dependent.yaml b/.../test1b_multiply_rule_time_dependent.yaml → ...les/01b_multiply_rule_time_dependent.yaml
@@ -22,4 +22,4 @@ rules:
       output_variable: new_water_level
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test1b_multiply_rule_time_dependent.nc
+  filename: ./tests_acceptance/output_nc_files/01b_multiply_rule_time_dependent.nc
diff --git a/..._multiply_rule_time_period_selection.yaml → ..._multiply_rule_time_period_selection.yaml b/..._multiply_rule_time_period_selection.yaml → ..._multiply_rule_time_period_selection.yaml
@@ -40,4 +40,4 @@ rules:
       output_variable: AVG_chloride_gp        
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test1c_multiply_rule_time_period_selection.nc
+  filename: ./tests_acceptance/output_nc_files/01c_multiply_rule_time_period_selection.nc
diff --git a/...lection_with_only_one_variable_saved.yaml → ...lection_with_only_one_variable_saved.yaml b/...lection_with_only_one_variable_saved.yaml → ...lection_with_only_one_variable_saved.yaml
@@ -40,5 +40,5 @@ rules:
       output_variable: AVG_chloride_gp 
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test1d_multiply_rule_time_period_selection_with_only_one_variable_saved.nc
+  filename: ./tests_acceptance/output_nc_files/01d_multiply_rule_time_period_selection_with_only_one_variable_saved.nc
   save_only_variables: AVG_chloride_gp
diff --git a/...ection_with_only_two_variables_saved.yaml → ...ection_with_only_two_variables_saved.yaml b/...ection_with_only_two_variables_saved.yaml → ...ection_with_only_two_variables_saved.yaml
@@ -40,5 +40,5 @@ rules:
       output_variable: AVG_chloride_gp        
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test1e_multiply_rule_time_period_selection_with_only_two_variables_saved.nc
+  filename: ./tests_acceptance/output_nc_files/01e_multiply_rule_time_period_selection_with_only_two_variables_saved.nc
   save_only_variables: [AVG_chloride_gp, chloride_gp]
diff --git a/...ut_yaml_files/test2_variable_mapping.yaml → ...input_yaml_files/02_variable_mapping.yaml b/...ut_yaml_files/test2_variable_mapping.yaml → ...input_yaml_files/02_variable_mapping.yaml
@@ -16,4 +16,4 @@ rules:
       output_variable: chloride
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test2_variable_mapping.nc
+  filename: ./tests_acceptance/output_nc_files/02_variable_mapping.nc
diff --git a/...aml_files/test3_layer_filter_layer22.yaml → ...t_yaml_files/03_layer_filter_layer22.yaml b/...aml_files/test3_layer_filter_layer22.yaml → ...t_yaml_files/03_layer_filter_layer22.yaml
@@ -16,4 +16,4 @@ rules:
       output_variable: salinity_top_layer
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test3_layer_filter_layer22.nc
+  filename: ./tests_acceptance/output_nc_files/03_layer_filter_layer22.nc
diff --git a/...aml_files/test3c_layer_filter_layer1.yaml → ...t_yaml_files/03b_layer_filter_layer0.yaml b/...aml_files/test3c_layer_filter_layer1.yaml → ...t_yaml_files/03b_layer_filter_layer0.yaml
@@ -16,4 +16,4 @@ rules:
       output_variable: salinity_top_layer
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test3c_layer_filter_layer1.nc
+  filename: ./tests_acceptance/output_nc_files/03b_layer_filter_layer0.nc
diff --git a/...aml_files/test3b_layer_filter_layer0.yaml → ...t_yaml_files/03c_layer_filter_layer1.yaml b/...aml_files/test3b_layer_filter_layer0.yaml → ...t_yaml_files/03c_layer_filter_layer1.yaml
@@ -16,4 +16,4 @@ rules:
       output_variable: salinity_top_layer
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test3b_layer_filter_layer0.nc
+  filename: ./tests_acceptance/output_nc_files/03c_layer_filter_layer1.nc
diff --git a/...files/test4_depending_rules_multiply.yaml → ...ml_files/04_depending_rules_multiply.yaml b/...files/test4_depending_rules_multiply.yaml → ...ml_files/04_depending_rules_multiply.yaml
@@ -23,4 +23,4 @@ rules:
       output_variable: salinity
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test4_depending_rules_multiply.nc
+  filename: ./tests_acceptance/output_nc_files/04_depending_rules_multiply.nc
diff --git a/...iles/test4b_depending_rules_multiply.yaml → ...l_files/04b_depending_rules_multiply.yaml b/...iles/test4b_depending_rules_multiply.yaml → ...l_files/04b_depending_rules_multiply.yaml
@@ -30,4 +30,4 @@ rules:
       output_variable: chloride2
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test4b_depending_rules_multiply.nc
+  filename: ./tests_acceptance/output_nc_files/04b_depending_rules_multiply.nc
diff --git a/...depending_rules_multiply_layerfilter.yaml → ...depending_rules_multiply_layerfilter.yaml b/...depending_rules_multiply_layerfilter.yaml → ...depending_rules_multiply_layerfilter.yaml
@@ -53,4 +53,4 @@ rules:
       input_variable: water_level
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test5_depending_rules_multiply_layerfilter.nc
+  filename: ./tests_acceptance/output_nc_files/05_depending_rules_multiply_layerfilter.nc
diff --git a/...yaml_files/test6_combine_results_add.yaml → ...ut_yaml_files/06_combine_results_add.yaml b/...yaml_files/test6_combine_results_add.yaml → ...ut_yaml_files/06_combine_results_add.yaml
@@ -17,4 +17,4 @@ rules:
       output_variable: bathymetry_time
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test6_combine_results_add.nc
+  filename: ./tests_acceptance/output_nc_files/06_combine_results_add.nc
diff --git a/...iles/test6b_combine_results_subtract.yaml → ...l_files/06b_combine_results_subtract.yaml b/...iles/test6b_combine_results_subtract.yaml → ...l_files/06b_combine_results_subtract.yaml
@@ -17,4 +17,4 @@ rules:
       output_variable: bathymetry
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test6b_combine_results_subtract.nc
+  filename: ./tests_acceptance/output_nc_files/06b_combine_results_subtract.nc
diff --git a/...aml_files/test6c_combine_results_min.yaml → ...t_yaml_files/06c_combine_results_min.yaml b/...aml_files/test6c_combine_results_min.yaml → ...t_yaml_files/06c_combine_results_min.yaml
@@ -17,4 +17,4 @@ rules:
       output_variable: bathymetry
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test6c_combine_results_min.nc
+  filename: ./tests_acceptance/output_nc_files/06c_combine_results_min.nc
diff --git a/...aml_files/test6d_combine_results_max.yaml → ...t_yaml_files/06d_combine_results_max.yaml b/...aml_files/test6d_combine_results_max.yaml → ...t_yaml_files/06d_combine_results_max.yaml
@@ -17,4 +17,4 @@ rules:
       output_variable: bathymetry
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test6d_combine_results_max.nc
+  filename: ./tests_acceptance/output_nc_files/06d_combine_results_max.nc
diff --git a/...iles/test6e_combine_results_multiply.yaml → ...l_files/06e_combine_results_multiply.yaml b/...iles/test6e_combine_results_multiply.yaml → ...l_files/06e_combine_results_multiply.yaml
@@ -17,4 +17,4 @@ rules:
       output_variable: bathymetry
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test6e_combine_results_multiply.nc
+  filename: ./tests_acceptance/output_nc_files/06e_combine_results_multiply.nc
diff --git a/...les/test6f_combine_results_with_nans.yaml → ..._files/06f_combine_results_with_nans.yaml b/...les/test6f_combine_results_with_nans.yaml → ..._files/06f_combine_results_with_nans.yaml
@@ -33,4 +33,4 @@ rules:
       output_variable: salinity_min
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test6f_combine_results_with_nans.nc
+  filename: ./tests_acceptance/output_nc_files/06f_combine_results_with_nans.nc
diff --git a/...ml_files/test7_time_aggregation_year.yaml → ..._yaml_files/07_time_aggregation_year.yaml b/...ml_files/test7_time_aggregation_year.yaml → ..._yaml_files/07_time_aggregation_year.yaml
@@ -34,4 +34,4 @@ rules:
       output_variable: MAX_water_level
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test7_time_aggregation_year.nc
+  filename: ./tests_acceptance/output_nc_files/07_time_aggregation_year.nc
diff --git a/..._files/test7b_time_aggregation_month.yaml → ...aml_files/07b_time_aggregation_month.yaml b/..._files/test7b_time_aggregation_month.yaml → ...aml_files/07b_time_aggregation_month.yaml
@@ -34,4 +34,4 @@ rules:
       output_variable: MAX_water_level
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test7b_time_aggregation_month.nc
+  filename: ./tests_acceptance/output_nc_files/07b_time_aggregation_month.nc
diff --git a/...gation_standarddeviation_percentiles.yaml → ...gation_standarddeviation_percentiles.yaml b/...gation_standarddeviation_percentiles.yaml → ...gation_standarddeviation_percentiles.yaml
@@ -85,4 +85,4 @@ rules:
 
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test7c_time_aggregation_standarddeviation_percentiles.nc
+  filename: ./tests_acceptance/output_nc_files/07c_time_aggregation_standarddeviation_percentiles.nc
diff --git a/...8_stepwise_classification_waterlevel.yaml → ...8_stepwise_classification_waterlevel.yaml b/...8_stepwise_classification_waterlevel.yaml → ...8_stepwise_classification_waterlevel.yaml
@@ -22,4 +22,4 @@ rules:
       output_variable: water_level_policy
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test8_stepwise_classification_waterlevel.nc
+  filename: ./tests_acceptance/output_nc_files/08_stepwise_classification_waterlevel.nc
diff --git a/...pwise_classification_salinity_limits.yaml → ...pwise_classification_salinity_limits.yaml b/...pwise_classification_salinity_limits.yaml → ...pwise_classification_salinity_limits.yaml
@@ -22,4 +22,4 @@ rules:
       output_variable: salinity_policy
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test8b_stepwise_classification_salinity_limits.nc
+  filename: ./tests_acceptance/output_nc_files/08b_stepwise_classification_salinity_limits.nc
diff --git a/...e_classification_salinity_categories.yaml → ...e_classification_salinity_categories.yaml b/...e_classification_salinity_categories.yaml → ...e_classification_salinity_categories.yaml
@@ -24,4 +24,4 @@ rules:
       output_variable: salinity_class
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test8c_stepwise_classification_salinity_categories.nc
+  filename: ./tests_acceptance/output_nc_files/08c_stepwise_classification_salinity_categories.nc
diff --git a/...lassification_waterlevel_lower_range.yaml → ...lassification_waterlevel_lower_range.yaml b/...lassification_waterlevel_lower_range.yaml → ...lassification_waterlevel_lower_range.yaml
@@ -19,4 +19,4 @@ rules:
       output_variable: salinity_policy
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test8d_stepwise_classification_waterlevel_lower_range.nc
+  filename: ./tests_acceptance/output_nc_files/08d_stepwise_classification_waterlevel_lower_range.nc
diff --git a/...lassification_waterlevel_otherformat.yaml → ...lassification_waterlevel_otherformat.yaml b/...lassification_waterlevel_otherformat.yaml → ...lassification_waterlevel_otherformat.yaml
@@ -24,4 +24,4 @@ rules:
       output_variable: water_level_policy
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test8f_stepwise_classification_waterlevel_otherformat.nc
+  filename: ./tests_acceptance/output_nc_files/08f_stepwise_classification_waterlevel_otherformat.nc
diff --git a/...iles/test9_response_curve_waterlevel.yaml → ...l_files/09_response_curve_waterlevel.yaml b/...iles/test9_response_curve_waterlevel.yaml → ...l_files/09_response_curve_waterlevel.yaml
@@ -24,4 +24,4 @@ rules:
       output_variable: HSI_Pnodosus_water_depth
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test9_response_curve_waterlevel.nc
+  filename: ./tests_acceptance/output_nc_files/09_response_curve_waterlevel.nc
diff --git a/...9c_response_curve_waterlevel_on_year.yaml → ...9c_response_curve_waterlevel_on_year.yaml b/...9c_response_curve_waterlevel_on_year.yaml → ...9c_response_curve_waterlevel_on_year.yaml
@@ -30,4 +30,4 @@ rules:
       output_variable: water_level_policy_year
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test9c_response_curve_waterlevel_on_year.nc
+  filename: ./tests_acceptance/output_nc_files/09c_response_curve_waterlevel_on_year.nc
diff --git a/...esponse_curve_waterlevel_otherformat.yaml → ...esponse_curve_waterlevel_otherformat.yaml b/...esponse_curve_waterlevel_otherformat.yaml → ...esponse_curve_waterlevel_otherformat.yaml
@@ -26,4 +26,4 @@ rules:
       output_variable: HSI_Pnodosus_water_depth
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test9e_response_curve_waterlevel_otherformat.nc
+  filename: ./tests_acceptance/output_nc_files/09e_response_curve_waterlevel_otherformat.nc
diff --git a/...iles/test10_formula_based_comparison.yaml → ...ml_files/10_formula_based_comparison.yaml b/...iles/test10_formula_based_comparison.yaml → ...ml_files/10_formula_based_comparison.yaml
@@ -24,4 +24,4 @@ rules:
       output_variable: dry_fall
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test10_formula_based_comparison.nc
+  filename: ./tests_acceptance/output_nc_files/10_formula_based_comparison.nc
diff --git a/...les/test10b_formula_based_arithmatic.yaml → ...l_files/10b_formula_based_arithmatic.yaml b/...les/test10b_formula_based_arithmatic.yaml → ...l_files/10b_formula_based_arithmatic.yaml
@@ -24,4 +24,4 @@ rules:
       output_variable: water_depth_scenario
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test10b_formula_based_arithmatic.nc
+  filename: ./tests_acceptance/output_nc_files/10b_formula_based_arithmatic.nc
diff --git a/...l_files/test10c_formula_based_ifelse.yaml → ..._yaml_files/10c_formula_based_ifelse.yaml b/...l_files/test10c_formula_based_ifelse.yaml → ..._yaml_files/10c_formula_based_ifelse.yaml
@@ -33,4 +33,4 @@ rules:
       output_variable: water_level_deviation
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test10c_formula_based_ifelse.nc
+  filename: ./tests_acceptance/output_nc_files/10c_formula_based_ifelse.nc
diff --git a/...d_formula_based_timeaxes_calculation.yaml → ...d_formula_based_timeaxes_calculation.yaml b/...d_formula_based_timeaxes_calculation.yaml → ...d_formula_based_timeaxes_calculation.yaml
@@ -16,4 +16,4 @@ rules:
       output_variable: water_depth_calc
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test10d_formula_based_timeaxes_calculation.nc
+  filename: ./tests_acceptance/output_nc_files/10d_formula_based_timeaxes_calculation.nc
diff --git a/...ude_file_response_curve_stepfunction.yaml → ...ude_file_response_curve_stepfunction.yaml b/...ude_file_response_curve_stepfunction.yaml → ...ude_file_response_curve_stepfunction.yaml
@@ -19,4 +19,4 @@ rules:
       output_variable: water_level_policy
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test11_yaml_include_file_response_curve_stepfunction.nc
+  filename: ./tests_acceptance/output_nc_files/11_yaml_include_file_response_curve_stepfunction.nc
diff --git a/...onse_curve_stepfunction_fullfunction.yaml → ...onse_curve_stepfunction_fullfunction.yaml b/...onse_curve_stepfunction_fullfunction.yaml → ...onse_curve_stepfunction_fullfunction.yaml
@@ -14,4 +14,4 @@ rules:
   - response_curve_rule: !include tables/input_IRM2.yaml
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test11b_yaml_include_file_response_curve_stepfunction_fullfunction.nc
+  filename: ./tests_acceptance/output_nc_files/11b_yaml_include_file_response_curve_stepfunction_fullfunction.nc
diff --git a/...les/test12_multiple_reclassification.yaml → ...l_files/12_multiple_reclassification.yaml b/...les/test12_multiple_reclassification.yaml → ...l_files/12_multiple_reclassification.yaml
@@ -91,4 +91,4 @@ rules:
       output_variable: aquatic_plant_classes
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test12_multiple_reclassification.nc
+  filename: ./tests_acceptance/output_nc_files/12_multiple_reclassification.nc
diff --git a/...test13_time_condition_rule_occurance.yaml → ...les/13_time_condition_rule_occurance.yaml b/...test13_time_condition_rule_occurance.yaml → ...les/13_time_condition_rule_occurance.yaml
@@ -55,4 +55,4 @@ rules:
       output_variable: Visualisation_number_of_dry_fall_periods
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test13_time_condition_rule_occurance.nc
+  filename: ./tests_acceptance/output_nc_files/13_time_condition_rule_occurance.nc
diff --git a/...test13b_time_condition_rule_duration.yaml → ...les/13b_time_condition_rule_duration.yaml b/...test13b_time_condition_rule_duration.yaml → ...les/13b_time_condition_rule_duration.yaml
@@ -85,4 +85,4 @@ rules:
       output_variable: Visualisation_max_duration_of_dry_periods
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test13b_time_condition_rule_duration.nc
+  filename: ./tests_acceptance/output_nc_files/13b_time_condition_rule_duration.nc
diff --git a/...input_yaml_files/test14_time_slicing.yaml → ...nce/input_yaml_files/14_time_slicing.yaml b/...input_yaml_files/test14_time_slicing.yaml → ...nce/input_yaml_files/14_time_slicing.yaml
@@ -20,4 +20,4 @@ rules:
       output_variable: chloride_mgl
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test14_time_slicing.nc
+  filename: ./tests_acceptance/output_nc_files/14_time_slicing.nc
diff --git a/...tistic_multiple_hour_and_day_results.yaml → ...tistic_multiple_hour_and_day_results.yaml b/...tistic_multiple_hour_and_day_results.yaml → ...tistic_multiple_hour_and_day_results.yaml
@@ -49,4 +49,4 @@ rules:
 
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test15_rolling_statistic_multiple_hour_and_day_results.nc
+  filename: ./tests_acceptance/output_nc_files/15_rolling_statistic_multiple_hour_and_day_results.nc
diff --git a/.../test16_axis_filter_faces_time_layer.yaml → ...iles/16_axis_filter_faces_time_layer.yaml b/.../test16_axis_filter_faces_time_layer.yaml → ...iles/16_axis_filter_faces_time_layer.yaml
@@ -35,4 +35,4 @@ rules:
       output_variable: salinity_PSU_time_30
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test16_axis_filter_faces_time_layer.nc
+  filename: ./tests_acceptance/output_nc_files/16_axis_filter_faces_time_layer.nc
diff --git a/...les/test17_depth_average_zlayer_rule.yaml → ...l_files/17_depth_average_zlayer_rule.yaml b/...les/test17_depth_average_zlayer_rule.yaml → ...l_files/17_depth_average_zlayer_rule.yaml
@@ -37,4 +37,4 @@ rules:
       output_variable: output_C
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test17_depth_average_zlayer_rule.nc
+  filename: ./tests_acceptance/output_nc_files/17_depth_average_zlayer_rule.nc
diff --git a/...test18_depth_average_sigmalayer_rule.yaml → ...les/18_depth_average_sigmalayer_rule.yaml b/...test18_depth_average_sigmalayer_rule.yaml → ...les/18_depth_average_sigmalayer_rule.yaml
@@ -37,4 +37,4 @@ rules:
       output_variable: output_C
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test18_depth_average_sigmalayer_rule.nc
+  filename: ./tests_acceptance/output_nc_files/18_depth_average_sigmalayer_rule.nc
diff --git a/...ut_yaml_files/test19_filter_extremes.yaml → .../input_yaml_files/19_filter_extremes.yaml b/...ut_yaml_files/test19_filter_extremes.yaml → .../input_yaml_files/19_filter_extremes.yaml
@@ -68,4 +68,4 @@ rules:
       output_variable: salinity_troughs
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test19_filter_extremes.nc
+  filename: ./tests_acceptance/output_nc_files/19_filter_extremes.nc
diff --git a/...0_partitioned_files_without_asterisk.yaml → ...0_partitioned_files_without_asterisk.yaml b/...0_partitioned_files_without_asterisk.yaml → ...0_partitioned_files_without_asterisk.yaml
@@ -13,4 +13,4 @@ rules:
       output_variable: very_large_salinity
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test20a_partitioned_files_without_asterisk_0001.nc
+  filename: ./tests_acceptance/output_nc_files/20a_partitioned_files_without_asterisk_0001.nc
diff --git a/...t20b_partitioned_files_with_asterisk.yaml → ...a_partitioned_files_without_asterisk.yaml b/...t20b_partitioned_files_with_asterisk.yaml → ...a_partitioned_files_without_asterisk.yaml
@@ -13,4 +13,4 @@ rules:
       output_variable: very_large_salinity
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test20b_parti*tioned_files_with_asterisk.nc
+  filename: ./tests_acceptance/output_nc_files/20a_partitioned_files_without_asterisk.nc
diff --git a/...a_partitioned_files_without_asterisk.yaml → .../20b_partitioned_files_with_asterisk.yaml b/...a_partitioned_files_without_asterisk.yaml → .../20b_partitioned_files_with_asterisk.yaml
@@ -13,4 +13,4 @@ rules:
       output_variable: very_large_salinity
 
 output-data:
-  filename: ./tests_acceptance/output_nc_files/test20a_partitioned_files_without_asterisk.nc
+  filename: ./tests_acceptance/output_nc_files/20b_parti*tioned_files_with_asterisk.nc
diff --git a/..._files/test1_default_independent_rules.nc → ..._nc_files/01_default_independent_rules.nc b/..._files/test1_default_independent_rules.nc → ..._nc_files/01_default_independent_rules.nc
diff --git a/...es/test1b_multiply_rule_time_dependent.nc → ...files/01b_multiply_rule_time_dependent.nc b/...es/test1b_multiply_rule_time_dependent.nc → ...files/01b_multiply_rule_time_dependent.nc
diff --git a/...1c_multiply_rule_time_period_selection.nc → ...1c_multiply_rule_time_period_selection.nc b/...1c_multiply_rule_time_period_selection.nc → ...1c_multiply_rule_time_period_selection.nc
diff --git a/...selection_with_only_one_variable_saved.nc → ...selection_with_only_one_variable_saved.nc b/...selection_with_only_one_variable_saved.nc → ...selection_with_only_one_variable_saved.nc
diff --git a/...election_with_only_two_variables_saved.nc → ...election_with_only_two_variables_saved.nc b/...election_with_only_two_variables_saved.nc → ...election_with_only_two_variables_saved.nc
diff --git a/...erence_nc_files/test2_variable_mapping.nc → ...reference_nc_files/02_variable_mapping.nc b/...erence_nc_files/test2_variable_mapping.nc → ...reference_nc_files/02_variable_mapping.nc
diff --git a/...ce_nc_files/test3_layer_filter_layer22.nc → ...rence_nc_files/03_layer_filter_layer22.nc b/...ce_nc_files/test3_layer_filter_layer22.nc → ...rence_nc_files/03_layer_filter_layer22.nc
diff --git a/...ce_nc_files/test3b_layer_filter_layer0.nc → ...rence_nc_files/03b_layer_filter_layer0.nc b/...ce_nc_files/test3b_layer_filter_layer0.nc → ...rence_nc_files/03b_layer_filter_layer0.nc
diff --git a/...ce_nc_files/test3c_layer_filter_layer1.nc → ...rence_nc_files/03c_layer_filter_layer1.nc b/...ce_nc_files/test3c_layer_filter_layer1.nc → ...rence_nc_files/03c_layer_filter_layer1.nc
diff --git a/...c_files/test4_depending_rules_multiply.nc → ...e_nc_files/04_depending_rules_multiply.nc b/...c_files/test4_depending_rules_multiply.nc → ...e_nc_files/04_depending_rules_multiply.nc
diff --git a/..._files/test4b_depending_rules_multiply.nc → ..._nc_files/04b_depending_rules_multiply.nc b/..._files/test4b_depending_rules_multiply.nc → ..._nc_files/04b_depending_rules_multiply.nc
diff --git a/...5_depending_rules_multiply_layerfilter.nc → ...5_depending_rules_multiply_layerfilter.nc b/...5_depending_rules_multiply_layerfilter.nc → ...5_depending_rules_multiply_layerfilter.nc
diff --git a/...nce_nc_files/test6_combine_results_add.nc → ...erence_nc_files/06_combine_results_add.nc b/...nce_nc_files/test6_combine_results_add.nc → ...erence_nc_files/06_combine_results_add.nc
diff --git a/..._files/test6b_combine_results_subtract.nc → ..._nc_files/06b_combine_results_subtract.nc b/..._files/test6b_combine_results_subtract.nc → ..._nc_files/06b_combine_results_subtract.nc
diff --git a/...ce_nc_files/test6c_combine_results_min.nc → ...rence_nc_files/06c_combine_results_min.nc b/...ce_nc_files/test6c_combine_results_min.nc → ...rence_nc_files/06c_combine_results_min.nc
diff --git a/...ce_nc_files/test6d_combine_results_max.nc → ...rence_nc_files/06d_combine_results_max.nc b/...ce_nc_files/test6d_combine_results_max.nc → ...rence_nc_files/06d_combine_results_max.nc
diff --git a/..._files/test6e_combine_results_multiply.nc → ..._nc_files/06e_combine_results_multiply.nc b/..._files/test6e_combine_results_multiply.nc → ..._nc_files/06e_combine_results_multiply.nc
diff --git a/...files/test6f_combine_results_with_nans.nc → ...nc_files/06f_combine_results_with_nans.nc b/...files/test6f_combine_results_with_nans.nc → ...nc_files/06f_combine_results_with_nans.nc
diff --git a/...e_nc_files/test7_time_aggregation_year.nc → ...ence_nc_files/07_time_aggregation_year.nc b/...e_nc_files/test7_time_aggregation_year.nc → ...ence_nc_files/07_time_aggregation_year.nc
diff --git a/...nc_files/test7b_time_aggregation_month.nc → ...ce_nc_files/07b_time_aggregation_month.nc b/...nc_files/test7b_time_aggregation_month.nc → ...ce_nc_files/07b_time_aggregation_month.nc
diff --git a/...regation_standarddeviation_percentiles.nc → ...regation_standarddeviation_percentiles.nc b/...regation_standarddeviation_percentiles.nc → ...regation_standarddeviation_percentiles.nc
diff --git a/...st8_stepwise_classification_waterlevel.nc → .../08_stepwise_classification_waterlevel.nc b/...st8_stepwise_classification_waterlevel.nc → .../08_stepwise_classification_waterlevel.nc
diff --git a/...tepwise_classification_salinity_limits.nc → ...tepwise_classification_salinity_limits.nc b/...tepwise_classification_salinity_limits.nc → ...tepwise_classification_salinity_limits.nc
diff --git a/...ise_classification_salinity_categories.nc → ...ise_classification_salinity_categories.nc b/...ise_classification_salinity_categories.nc → ...ise_classification_salinity_categories.nc
diff --git a/..._classification_waterlevel_lower_range.nc → ..._classification_waterlevel_lower_range.nc b/..._classification_waterlevel_lower_range.nc → ..._classification_waterlevel_lower_range.nc
diff --git a/..._classification_waterlevel_otherformat.nc → ..._classification_waterlevel_otherformat.nc b/..._classification_waterlevel_otherformat.nc → ..._classification_waterlevel_otherformat.nc
diff --git a/..._files/test9_response_curve_waterlevel.nc → ..._nc_files/09_response_curve_waterlevel.nc b/..._files/test9_response_curve_waterlevel.nc → ..._nc_files/09_response_curve_waterlevel.nc
diff --git a/...st9c_response_curve_waterlevel_on_year.nc → .../09c_response_curve_waterlevel_on_year.nc b/...st9c_response_curve_waterlevel_on_year.nc → .../09c_response_curve_waterlevel_on_year.nc
diff --git a/..._response_curve_waterlevel_otherformat.nc → ..._response_curve_waterlevel_otherformat.nc b/..._response_curve_waterlevel_otherformat.nc → ..._response_curve_waterlevel_otherformat.nc
diff --git a/..._files/test10_formula_based_comparison.nc → ...e_nc_files/10_formula_based_comparison.nc b/..._files/test10_formula_based_comparison.nc → ...e_nc_files/10_formula_based_comparison.nc
diff --git a/...files/test10b_formula_based_arithmatic.nc → ..._nc_files/10b_formula_based_arithmatic.nc b/...files/test10b_formula_based_arithmatic.nc → ..._nc_files/10b_formula_based_arithmatic.nc
diff --git a/..._nc_files/test10c_formula_based_ifelse.nc → ...ence_nc_files/10c_formula_based_ifelse.nc b/..._nc_files/test10c_formula_based_ifelse.nc → ...ence_nc_files/10c_formula_based_ifelse.nc
diff --git a/...10d_formula_based_timeaxes_calculation.nc → ...10d_formula_based_timeaxes_calculation.nc b/...10d_formula_based_timeaxes_calculation.nc → ...10d_formula_based_timeaxes_calculation.nc
diff --git a/...clude_file_response_curve_stepfunction.nc → ...clude_file_response_curve_stepfunction.nc b/...clude_file_response_curve_stepfunction.nc → ...clude_file_response_curve_stepfunction.nc
diff --git a/...sponse_curve_stepfunction_fullfunction.nc → ...sponse_curve_stepfunction_fullfunction.nc b/...sponse_curve_stepfunction_fullfunction.nc → ...sponse_curve_stepfunction_fullfunction.nc
diff --git a/...files/test12_multiple_reclassification.nc → ..._nc_files/12_multiple_reclassification.nc b/...files/test12_multiple_reclassification.nc → ..._nc_files/12_multiple_reclassification.nc
diff --git a/...s/test13_time_condition_rule_occurance.nc → ...files/13_time_condition_rule_occurance.nc b/...s/test13_time_condition_rule_occurance.nc → ...files/13_time_condition_rule_occurance.nc
diff --git a/...s/test13b_time_condition_rule_duration.nc → ...files/13b_time_condition_rule_duration.nc b/...s/test13b_time_condition_rule_duration.nc → ...files/13b_time_condition_rule_duration.nc
diff --git a/...reference_nc_files/test14_time_slicing.nc → ...nce/reference_nc_files/14_time_slicing.nc b/...reference_nc_files/test14_time_slicing.nc → ...nce/reference_nc_files/14_time_slicing.nc
diff --git a/...tatistic_multiple_hour_and_day_results.nc → ...tatistic_multiple_hour_and_day_results.nc b/...tatistic_multiple_hour_and_day_results.nc → ...tatistic_multiple_hour_and_day_results.nc
diff --git a/...es/test16_axis_filter_faces_time_layer.nc → ..._files/16_axis_filter_faces_time_layer.nc b/...es/test16_axis_filter_faces_time_layer.nc → ..._files/16_axis_filter_faces_time_layer.nc
diff --git a/...files/test17_depth_average_zlayer_rule.nc → ..._nc_files/17_depth_average_zlayer_rule.nc b/...files/test17_depth_average_zlayer_rule.nc → ..._nc_files/17_depth_average_zlayer_rule.nc
diff --git a/...s/test18_depth_average_sigmalayer_rule.nc → ...files/18_depth_average_sigmalayer_rule.nc b/...s/test18_depth_average_sigmalayer_rule.nc → ...files/18_depth_average_sigmalayer_rule.nc
diff --git a/...erence_nc_files/test19_filter_extremes.nc → .../reference_nc_files/19_filter_extremes.nc b/...erence_nc_files/test19_filter_extremes.nc → .../reference_nc_files/19_filter_extremes.nc
diff --git a/...artitioned_files_without_asterisk_0001.nc → ...artitioned_files_without_asterisk_0001.nc b/...artitioned_files_without_asterisk_0001.nc → ...artitioned_files_without_asterisk_0001.nc
diff --git a/...artitioned_files_without_asterisk_0002.nc → ...artitioned_files_without_asterisk_0002.nc b/...artitioned_files_without_asterisk_0002.nc → ...artitioned_files_without_asterisk_0002.nc
diff --git a/...artitioned_files_without_asterisk_0003.nc → ...artitioned_files_without_asterisk_0003.nc b/...artitioned_files_without_asterisk_0003.nc → ...artitioned_files_without_asterisk_0003.nc
diff --git a/...0b_parti0001tioned_files_with_asterisk.nc → ...0b_parti0001tioned_files_with_asterisk.nc b/...0b_parti0001tioned_files_with_asterisk.nc → ...0b_parti0001tioned_files_with_asterisk.nc
diff --git a/...0b_parti0002tioned_files_with_asterisk.nc → ...0b_parti0002tioned_files_with_asterisk.nc b/...0b_parti0002tioned_files_with_asterisk.nc → ...0b_parti0002tioned_files_with_asterisk.nc
diff --git a/...0b_parti0003tioned_files_with_asterisk.nc → ...0b_parti0003tioned_files_with_asterisk.nc b/...0b_parti0003tioned_files_with_asterisk.nc → ...0b_parti0003tioned_files_with_asterisk.nc
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,4 +85,4 @@ rules:


		output-data:
		filename: ./tests_acceptance/output_nc_files/test7c_time_aggregation_standarddeviation_percentiles.nc
		filename: ./tests_acceptance/output_nc_files/07c_time_aggregation_standarddeviation_percentiles.nc
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,4 +49,4 @@ rules:


		output-data:
		filename: ./tests_acceptance/output_nc_files/test15_rolling_statistic_multiple_hour_and_day_results.nc
		filename: ./tests_acceptance/output_nc_files/15_rolling_statistic_multiple_hour_and_day_results.nc