diff --git a/coordinator/EnvSuitPipeline.py b/coordinator/EnvSuitPipeline.py
index 20e570c91e24027726efee3ad469c62e9d764dc0..5fb07ec844d160b61f239b4b90b162831720ddac 100644
--- a/coordinator/EnvSuitPipeline.py
+++ b/coordinator/EnvSuitPipeline.py
@@ -261,9 +261,9 @@ def run_pipeline(pipeline_config, region, dateString, extracted = False, prevent
# run_merger(config, sys_config, processor_name)
- resultFile = envSuitPath + 'RIE.tif'
+ resultFile = envSuitPath + 'RIE.nc'
strain_outPath = os.path.join(region_outPath,strain)
- strain_outFile = strain_outPath + '/RIE_value.tif'
+ strain_outFile = strain_outPath + '/RIE_value.nc'
# Check results dimension
# result = pd.read_csv(resultFile)
diff --git a/coordinator/ProcessorEnvironment.py b/coordinator/ProcessorEnvironment.py
index d3b70db74b8101542db4a3089e89901e40082659..57801263af1bbb16d7aca471cc1722ace3d54a7c 100644
--- a/coordinator/ProcessorEnvironment.py
+++ b/coordinator/ProcessorEnvironment.py
@@ -180,7 +180,7 @@ class ProcessorEnvironment(Processor):
for region in subregions:
output_dir = f"{jobPath}/plotting/{region.lower()}"
- csv_template_dir = input_dir + "/{DISEASE_DIR}/RIE_value.tif"
+ csv_template_dir = input_dir + "/{DISEASE_DIR}/RIE_value.nc"
Path(output_dir).mkdir(parents=True, exist_ok=True)
diff --git a/tests/integration/full/full_test_epi.py b/tests/integration/full/full_test_epi.py
index 33fb8edf30b8998f7448b0662553e3bef945b438..1c96b33f67b94f18fcfee64df50ab71aee7ab708 100644
--- a/tests/integration/full/full_test_epi.py
+++ b/tests/integration/full/full_test_epi.py
@@ -20,10 +20,10 @@ class FullTestEpi(BaseEpiTestSuite.EpiTestSuite):
self.set_expected_values()
- if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH):
- # if True:
+ # if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH):
+ if True:
FullTestEpi.write_temp_run_config_files()
- FullTestEpi.run_dependent_pipelines()
+ # FullTestEpi.run_dependent_pipelines()
FullTestEpi.run_epi_pipeline()
else:
print(f"output in {IntegrationTestUtils.TEST_OUT_PATH} already written, skipping rerun")
diff --git a/tests/integration/partial/integration_test_utils.py b/tests/integration/partial/integration_test_utils.py
index 9903274e81c3eecb127359666ecc018a3c5dc606..200384138495dd7c4fa65e69312b791610945ab6 100644
--- a/tests/integration/partial/integration_test_utils.py
+++ b/tests/integration/partial/integration_test_utils.py
@@ -83,8 +83,8 @@ class IntegrationTestUtils:
IntegrationTestUtils.DEFAULT_CONFIG_FILE_PATH = _config_file
nowstring: str = IntegrationTestUtils.get_now_string()
- prefix: str = f"temp_{test_prefix}_" + nowstring
- # prefix: str = f"temp_{test_prefix}"
+ # prefix: str = f"temp_{test_prefix}_" + nowstring
+ prefix: str = f"temp_{test_prefix}"
IntegrationTestUtils.TEST_OUT_PATH = _outdir + prefix + os.sep
IntegrationTestUtils.EMAIL_CRED_PATH = _email_cred_path
@@ -264,6 +264,6 @@ class IntegrationTestUtils:
result = custom_run_date
else:
print("default")
- result = "20230126"
+ result = "20231127"
return result
diff --git a/tests/integration/partial/test_advisory.py b/tests/integration/partial/test_advisory.py
index d8558cd7459895a0e0508f9fbc671c9225b5861c..bdfe984c55f76fb9d6520fb42dcfa4b67d8ab3f0 100644
--- a/tests/integration/partial/test_advisory.py
+++ b/tests/integration/partial/test_advisory.py
@@ -18,7 +18,7 @@ class TestAdvisory(BaseAdvisoryTestSuite.AdvisoryTestSuite):
IntegrationTestUtils.TEST_OUT_PATH = None
def set_expected_values(self):
- IntegrationTestUtils.TEST_START_DATE = '20221001'
+ IntegrationTestUtils.TEST_START_DATE = '20231127'
IntegrationTestUtils.TEST_JOB_DIR = "ADVISORY_" + IntegrationTestUtils.TEST_START_DATE
self.EXPECTED_EA_IMAGE_COUNT = 6
self.EXPECTED_ETH_IMAGE_COUNT = 6
diff --git a/tests/integration/partial/test_deposition.py b/tests/integration/partial/test_deposition.py
index 96268cb9510e7a6d5fc71c4f0474a43b622d139f..8e665e40b23b6f2b9ceb3b19e6c3d1341098abee 100644
--- a/tests/integration/partial/test_deposition.py
+++ b/tests/integration/partial/test_deposition.py
@@ -19,7 +19,7 @@ class TestDeposition(BaseDepoTestSuite.DepoTestSuite):
def set_expected_values(self):
- IntegrationTestUtils.TEST_START_DATE = "20221001"
+ IntegrationTestUtils.TEST_START_DATE = "20231127"
IntegrationTestUtils.TEST_JOB_DIR = "DEPOSITION_" + IntegrationTestUtils.TEST_START_DATE
self.EA_CSV_COUNT = 9
diff --git a/tests/integration/partial/test_env_suit.py b/tests/integration/partial/test_env_suit.py
index 843556a46f285d9c7ea66d71ed99b1a94bf6be38..55c7d82ebec9ac2abf9ccf0727f5f62a9cc06f80 100644
--- a/tests/integration/partial/test_env_suit.py
+++ b/tests/integration/partial/test_env_suit.py
@@ -18,7 +18,7 @@ class TestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite):
IntegrationTestUtils.TEST_OUT_PATH = None
def set_expected_values(self):
- IntegrationTestUtils.TEST_START_DATE = "20221001"
+ IntegrationTestUtils.TEST_START_DATE = "20231127"
IntegrationTestUtils.TEST_JOB_DIR = "ENVIRONMENT_2.0_" + IntegrationTestUtils.TEST_START_DATE
self.EA_CSV_COUNT = 18
diff --git a/tests/integration/partial/test_epi.py b/tests/integration/partial/test_epi.py
index a5433b9a0842265cd62a8d8437f58888cc563ed7..5922cf2373c1ff0a13a3dc998dc450eba46114c1 100644
--- a/tests/integration/partial/test_epi.py
+++ b/tests/integration/partial/test_epi.py
@@ -18,7 +18,7 @@ class TestEpi(BaseEpiTestSuite.EpiTestSuite):
def set_expected_values(self):
super().set_expected_values()
- IntegrationTestUtils.TEST_START_DATE = '20221001'
+ IntegrationTestUtils.TEST_START_DATE = '20231127'
IntegrationTestUtils.TEST_JOB_DIR = "EPI_" + IntegrationTestUtils.TEST_START_DATE
diff --git a/tests/integration/partial/test_survey.py b/tests/integration/partial/test_survey.py
index 0026f5206ed6771858d74b04ef95f4888b1fda53..1c33aff12646b9f061c3df744e785fac48f4186b 100644
--- a/tests/integration/partial/test_survey.py
+++ b/tests/integration/partial/test_survey.py
@@ -18,7 +18,7 @@ class TestSurvey(BaseSurveyTestSuite.SurveyTestSuite):
IntegrationTestUtils.TEST_OUT_PATH = None
def set_expected_values(self):
- IntegrationTestUtils.TEST_START_DATE = '20221001'
+ IntegrationTestUtils.TEST_START_DATE = '20231127'
IntegrationTestUtils.TEST_JOB_DIR = "SURVEYDATA_" + IntegrationTestUtils.TEST_START_DATE
diff --git a/tests/integration/test_suites/depo_test_suite.py b/tests/integration/test_suites/depo_test_suite.py
index 2b7c8319b984094bc713baf0cc2110615f1195e3..897462b96320612514ca0bcf196ad0f06a6b1373 100644
--- a/tests/integration/test_suites/depo_test_suite.py
+++ b/tests/integration/test_suites/depo_test_suite.py
@@ -61,10 +61,10 @@ class BaseDepoTestSuite:
def test_standard_run_all_input_csvs_produced(self):
east_africa_csv_path = os.path.join(IntegrationTestUtils.TEST_OUT_PATH,
IntegrationTestUtils.TEST_JOB_DIR,
- "plotting", "eastafrica", "input_csvs", "*.tif")
+ "plotting", "eastafrica", "input_csvs", "*.nc")
ethiopia_csv_path = os.path.join(IntegrationTestUtils.TEST_OUT_PATH,
IntegrationTestUtils.TEST_JOB_DIR,
- "plotting", "ethiopia", "input_csvs", "*.tif")
+ "plotting", "ethiopia", "input_csvs", "*.nc")
ea_csv_count: int = IntegrationTestUtils.count_files_in_wildcard(east_africa_csv_path)
eth_csv_count: int = IntegrationTestUtils.count_files_in_wildcard(ethiopia_csv_path)
diff --git a/tests/integration/test_suites/env_suit_test_suite.py b/tests/integration/test_suites/env_suit_test_suite.py
index 0030bfcab6c287e385da84cf8d1473112d232e12..95cdca542161472fabe6b5f91e0ef90f920a09c0 100644
--- a/tests/integration/test_suites/env_suit_test_suite.py
+++ b/tests/integration/test_suites/env_suit_test_suite.py
@@ -62,10 +62,10 @@ class BaseEnvSuitTestSuite:
def test_standard_run_all_input_csvs_produced(self):
east_africa_csv_path = os.path.join(IntegrationTestUtils.TEST_OUT_PATH,
IntegrationTestUtils.TEST_JOB_DIR,
- "plotting", "eastafrica", "input_csvs", "*.tif")
+ "plotting", "eastafrica", "input_csvs", "*.nc")
ethiopia_csv_path = os.path.join(IntegrationTestUtils.TEST_OUT_PATH,
IntegrationTestUtils.TEST_JOB_DIR,
- "plotting", "ethiopia", "input_csvs", "*.tif")
+ "plotting", "ethiopia", "input_csvs", "*.nc")
ea_csv_count: int = IntegrationTestUtils.count_files_in_wildcard(east_africa_csv_path)
eth_csv_count: int = IntegrationTestUtils.count_files_in_wildcard(ethiopia_csv_path)