Changed flux model layer sources back to gfw-data-lake from gfw-files.

wri · Oct 25, 2023 · 97be16a · 97be16a
1 parent 48f0f87
commit 97be16a
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 44 deletions.
diff --git a/src/main/scala/org/globalforestwatch/layers/GrossCumulAbovegroundRemovalsCo2.scala b/src/main/scala/org/globalforestwatch/layers/GrossCumulAbovegroundRemovalsCo2.scala
@@ -6,15 +6,15 @@ case class GrossCumulAbovegroundRemovalsCo2(gridTile: GridTile, model: String =
   extends FloatLayer
     with OptionalFLayer {
 
-//  val datasetName = "gfw_full_extent_aboveground_gross_removals"
-//
-//  val uri: String =
-//    uriForGrid(gridTile, kwargs)
-
-  // For carbonflux package run only
-  val datasetName = "Na"
+  val datasetName = "gfw_full_extent_aboveground_gross_removals"
 
-  val model_suffix: String = if (model == "standard") "standard" else s"$model"
   val uri: String =
-    s"s3://gfw-files/flux_1_2_3/gross_removals_AGCO2_all_forest_types/$model_suffix/${gridTile.tileId}.tif"
+    uriForGrid(gridTile, kwargs)
+
+//  // For carbonflux package run only
+//  val datasetName = "Na"
+//
+//  val model_suffix: String = if (model == "standard") "standard" else s"$model"
+//  val uri: String =
+//    s"s3://gfw-files/flux_1_2_3/gross_removals_AGCO2_all_forest_types/$model_suffix/${gridTile.tileId}.tif"
 }
diff --git a/src/main/scala/org/globalforestwatch/layers/GrossCumulBelowgroundRemovalsCo2.scala b/src/main/scala/org/globalforestwatch/layers/GrossCumulBelowgroundRemovalsCo2.scala
@@ -6,16 +6,16 @@ case class GrossCumulBelowgroundRemovalsCo2(gridTile: GridTile, model: String =
   extends FloatLayer
     with OptionalFLayer {
 
-//  val datasetName = "gfw_full_extent_belowground_gross_removals"
-//
-//  val uri: String =
-//    uriForGrid(gridTile, kwargs)
+  val datasetName = "gfw_full_extent_belowground_gross_removals"
 
+  val uri: String =
+    uriForGrid(gridTile, kwargs)
 
-  // For carbonflux package run only
-  val datasetName = "Na"
 
-  val model_suffix: String = if (model == "standard") "standard" else s"$model"
-  val uri: String =
-    s"s3://gfw-files/flux_1_2_3/gross_removals_BGCO2_all_forest_types/$model_suffix/${gridTile.tileId}.tif"
+//  // For carbonflux package run only
+//  val datasetName = "Na"
+//
+//  val model_suffix: String = if (model == "standard") "standard" else s"$model"
+//  val uri: String =
+//    s"s3://gfw-files/flux_1_2_3/gross_removals_BGCO2_all_forest_types/$model_suffix/${gridTile.tileId}.tif"
 }
diff --git a/src/main/scala/org/globalforestwatch/layers/GrossEmissionsCo2OnlyCo2e.scala b/src/main/scala/org/globalforestwatch/layers/GrossEmissionsCo2OnlyCo2e.scala
@@ -6,14 +6,14 @@ case class GrossEmissionsCo2OnlyCo2e(gridTile: GridTile,  model: String = "stand
   extends FloatLayer
     with OptionalFLayer {
 
-//  val datasetName = "gfw_full_extent_co2_gross_emissions"
-//
-//  val uri: String =
-//    uriForGrid(gridTile, kwargs)
-
-  val datasetName = "Na"
+  val datasetName = "gfw_full_extent_co2_gross_emissions"
 
-  val model_suffix: String = if (model == "standard") "standard" else s"$model"
   val uri: String =
-    s"s3://gfw-files/flux_1_2_3/gross_emissions_co2_only_co2e/$model_suffix/${gridTile.tileId}.tif"
+    uriForGrid(gridTile, kwargs)
+
+//  val datasetName = "Na"
+//
+//  val model_suffix: String = if (model == "standard") "standard" else s"$model"
+//  val uri: String =
+//    s"s3://gfw-files/flux_1_2_3/gross_emissions_co2_only_co2e/$model_suffix/${gridTile.tileId}.tif"
 }
diff --git a/src/main/scala/org/globalforestwatch/layers/GrossEmissionsNonCo2Co2e.scala b/src/main/scala/org/globalforestwatch/layers/GrossEmissionsNonCo2Co2e.scala
@@ -6,16 +6,16 @@ case class GrossEmissionsNonCo2Co2e(gridTile: GridTile, model: String = "standar
   extends FloatLayer
     with OptionalFLayer {
 
-//  val datasetName = "gfw_full_extent_non_co2_gross_emissions"
-//
-//  val uri: String =
-//    uriForGrid(gridTile, kwargs)
+  val datasetName = "gfw_full_extent_non_co2_gross_emissions"
 
+  val uri: String =
+    uriForGrid(gridTile, kwargs)
 
-  // For carbonflux package run only
-  val datasetName = "Na"
 
-  val model_suffix: String = if (model == "standard") "standard" else s"$model"
-  val uri: String =
-    s"s3://gfw-files/flux_1_2_3/gross_emissions_non_co2_co2e/$model_suffix/${gridTile.tileId}.tif"
+//  // For carbonflux package run only
+//  val datasetName = "Na"
+//
+//  val model_suffix: String = if (model == "standard") "standard" else s"$model"
+//  val uri: String =
+//    s"s3://gfw-files/flux_1_2_3/gross_emissions_non_co2_co2e/$model_suffix/${gridTile.tileId}.tif"
 }
diff --git a/src/main/scala/org/globalforestwatch/layers/NetFluxCo2e.scala b/src/main/scala/org/globalforestwatch/layers/NetFluxCo2e.scala
@@ -6,16 +6,16 @@ case class NetFluxCo2e(gridTile: GridTile, model: String = "standard", kwargs: M
   extends FloatLayer
     with OptionalFLayer {
 
-//  val datasetName = "gfw_full_extent_net_flux"
-//
-//  val uri: String =
-//    uriForGrid(gridTile, kwargs)
+  val datasetName = "gfw_full_extent_net_flux"
 
+  val uri: String =
+    uriForGrid(gridTile, kwargs)
 
-  // For carbonflux package run only
-  val datasetName = "Na"
 
-  val model_suffix: String = if (model == "standard") "standard" else s"$model"
-  val uri: String =
-    s"s3://gfw-files/flux_1_2_3/net_flux_all_forest_types_all_drivers/$model_suffix/${gridTile.tileId}.tif"
+//  // For carbonflux package run only
+//  val datasetName = "Na"
+//
+//  val model_suffix: String = if (model == "standard") "standard" else s"$model"
+//  val uri: String =
+//    s"s3://gfw-files/flux_1_2_3/net_flux_all_forest_types_all_drivers/$model_suffix/${gridTile.tileId}.tif"
 }