Fix broken raked pops

Author: collijk

src/rra_population_model/postprocess/compile_results.py

@@ -91,7 +91,7 @@ def compile_results_main(
 @clio.with_resolution()
 @click.option("--bx", type=int, required=True)
 @click.option("--by", type=int, required=True)
-@clio.with_time_point(pmc.ALL_TIME_POINTS)
+@clio.with_time_point(pmc.ANNUAL_TIME_POINTS)
 @clio.with_output_directory(pmc.MODEL_ROOT)
 @clio.with_num_cores(8)
 def compile_results_task(
@@ -183,7 +183,7 @@ def upsample_main(
 @clio.with_model_name()
 @clio.with_resolution()
 @with_spec_name()
-@clio.with_time_point(pmc.ALL_TIME_POINTS)
+@clio.with_time_point(pmc.ANNUAL_TIME_POINTS)
 @clio.with_output_directory(pmc.MODEL_ROOT)
 def upsample_task(
     model_name: str,
@@ -199,7 +199,7 @@ def upsample_task(
 @clio.with_model_name()
 @clio.with_resolution()
 @with_spec_name(allow_all=True)
-@clio.with_time_point(pmc.ALL_TIME_POINTS, allow_all=True)
+@clio.with_time_point([str(y) for y in range(1950, 1976)], allow_all=True)
 @clio.with_output_directory(pmc.MODEL_ROOT)
 @clio.with_num_cores(8)
 @clio.with_queue()

src/rra_population_model/postprocess/rake.py

@@ -247,7 +247,7 @@ def rake_main(
 @clio.with_resolution()
 @clio.with_model_name()
 @clio.with_block_key()
-@clio.with_time_point(choices=pmc.ALL_TIME_POINTS)
+@clio.with_time_point(choices=pmc.ANNUAL_TIME_POINTS)
 @clio.with_output_directory(pmc.MODEL_ROOT)
 def rake_task(
     resolution: str,
@@ -262,7 +262,7 @@ def rake_task(
 @click.command()  # type: ignore[arg-type]
 @clio.with_resolution(allow_all=False)
 @clio.with_model_name()
-@clio.with_time_point(allow_all=True)
+@clio.with_time_point([str(y) for y in range(1950, 1976)], allow_all=True)
 @clio.with_output_directory(pmc.MODEL_ROOT)
 @clio.with_num_cores(default=8)
 @clio.with_queue()
@@ -279,7 +279,7 @@ def rake(
     print("Preparing runs")
 
     model_names = [
-        # "msftv4_density_log_ntl",
+        "msftv4_density_log_ntl",
         "ghsl_density_log_ntl",
         "ghsl_volume_log_ntl",
         "ghsl_residential_density_log_ntl",
@@ -327,7 +327,7 @@ def rake(
         node_args={
             "block-key": block_keys,
             "time-point": time_point,
-            "model-name": model_names,
+            "model-name": ["ghsl_residential_volume_log_ntl"],
         },
         task_args={
             "resolution": resolution,