From 9fb9e3dd9e786e9f20577c3c31176d744eded8c5 Mon Sep 17 00:00:00 2001
From: nehajo88 <nehajo88@gmail.com>
Date: Tue, 20 Aug 2024 11:37:24 -0700
Subject: [PATCH] Classifying the world into IPCC Table 4.7
---
.../build_command_main_ADE-checkpoint.sh | 6 ++---
.../env_main_ADE-checkpoint.yaml | 5 ++--
.../IPCC_classes_DPS/IPCC_GEDI_Table4.7.ipynb | 24 +++++++++----------
.../build_command_main_ADE.sh | 6 ++---
.../IPCC_classes_DPS/env_main_ADE.yaml | 5 ++--
.../IPCC_classes_DPS/run_IPCC_classes_ADE.yml | 2 +-
6 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/country_summaries/IPCC_classes_DPS/.ipynb_checkpoints/build_command_main_ADE-checkpoint.sh b/country_summaries/IPCC_classes_DPS/.ipynb_checkpoints/build_command_main_ADE-checkpoint.sh
index 51e6af9..71767cf 100644
--- a/country_summaries/IPCC_classes_DPS/.ipynb_checkpoints/build_command_main_ADE-checkpoint.sh
+++ b/country_summaries/IPCC_classes_DPS/.ipynb_checkpoints/build_command_main_ADE-checkpoint.sh
@@ -3,9 +3,9 @@ set -x
basedir=$( cd "$(dirname "$0")" ; pwd -P )
-conda env update -n base --solver=libmamba -f ${basedir}/env_main_ADE.yaml
+conda env update -n python --solver=libmamba -f ${basedir}/env_main_ADE.yaml
## install to the base env
-conda env update -n base --solver=libmamba -f ${basedir}/env_main_ADE.yaml
+conda env update -n python --solver=libmamba -f ${basedir}/env_main_ADE.yaml
-pip3 install pyOpenSSL --upgrade
+pip3 install pyOpenSSL --upgrade
\ No newline at end of file
diff --git a/country_summaries/IPCC_classes_DPS/.ipynb_checkpoints/env_main_ADE-checkpoint.yaml b/country_summaries/IPCC_classes_DPS/.ipynb_checkpoints/env_main_ADE-checkpoint.yaml
index fa1a571..09bc833 100644
--- a/country_summaries/IPCC_classes_DPS/.ipynb_checkpoints/env_main_ADE-checkpoint.yaml
+++ b/country_summaries/IPCC_classes_DPS/.ipynb_checkpoints/env_main_ADE-checkpoint.yaml
@@ -7,7 +7,8 @@ dependencies:
- memory_profiler==0.61.0 # optional
- pandas>=1.4.1
- numpy>=1.22.3
- - rasterio>=1.2.10
+ - rasterio>=1.3.10
- matplotlib>=3.6.2
- pip:
- - rio-cogeo
\ No newline at end of file
+ - rio-cogeo
+ - git+https://github.com/MAAP-Project/maap-py.git@v4.0.0
\ No newline at end of file
diff --git a/country_summaries/IPCC_classes_DPS/IPCC_GEDI_Table4.7.ipynb b/country_summaries/IPCC_classes_DPS/IPCC_GEDI_Table4.7.ipynb
index ce82a44..4a2904d 100644
--- a/country_summaries/IPCC_classes_DPS/IPCC_GEDI_Table4.7.ipynb
+++ b/country_summaries/IPCC_classes_DPS/IPCC_GEDI_Table4.7.ipynb
@@ -349,11 +349,11 @@
"# cd /projects/ADE_biomass_harmonization/biomass_harmonization\n",
"# git add country_summaries/IPCC_classes_DPS\n",
"# git commit -m ' Classifying the world into IPCC Table 4.7'\n",
- "# git tag -f IPCC_classes_ADE_v7\n",
+ "# git tag -f IPCC_classes_ADE_v8\n",
"\n",
- "# git push origin -f IPCC_classes_ADE_v7\n",
+ "# git push origin -f IPCC_classes_ADE_v8\n",
"# git push\n",
- "# git push origin -f IPCC_classes_ADE_v7"
+ "# git push origin -f IPCC_classes_ADE_v8"
]
},
{
@@ -397,7 +397,7 @@
},
"outputs": [],
"source": [
- "Desired_output_folder = '/projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v7_COG/'\n",
+ "Desired_output_folder = '/projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v8_COG/'\n",
"if not os.path.exists(Desired_output_folder):\n",
" os.mkdir(Desired_output_folder)\n",
"TILES = [\"00N_000E\",\"00N_010E\",\"00N_020E\",\"00N_030E\",\"00N_040E\",\"00N_040W\",\"00N_050W\",\"00N_060W\",\"00N_070W\",\"00N_080W\",\"00N_090E\",\"00N_090W\",\"00N_100E\",\"00N_110E\",\"00N_120E\",\"00N_130E\",\"00N_140E\",\"00N_150E\",\"00N_160E\",\"10N_000E\",\"10N_010E\",\"10N_010W\",\"10N_020E\",\"10N_020W\",\"10N_030E\",\"10N_040E\",\"10N_050E\",\"10N_050W\",\"10N_060W\",\"10N_070E\",\"10N_070W\",\"10N_080E\",\"10N_080W\",\"10N_090E\",\"10N_090W\",\"10N_100E\",\"10N_110E\",\"10N_120E\",\"10N_130E\",\"10S_010E\",\"10S_020E\",\"10S_030E\",\"10S_040E\",\"10S_040W\",\"10S_050E\",\"10S_050W\",\"10S_060W\",\"10S_070W\",\"10S_080W\",\"10S_110E\",\"10S_120E\",\"10S_130E\",\"10S_140E\",\"10S_150E\",\"10S_160E\",\"10S_170E\",\"20N_000E\",\"20N_010E\",\"20N_010W\",\"20N_020E\",\"20N_020W\",\"20N_030E\",\"20N_040E\",\"20N_050E\",\"20N_060W\",\"20N_070E\",\"20N_070W\",\"20N_080E\",\"20N_080W\",\"20N_090E\",\"20N_090W\",\"20N_100E\",\"20N_100W\",\"20N_110E\",\"20N_110W\",\"20N_120E\",\"20N_160W\",\"20S_010E\",\"20S_020E\",\"20S_030E\",\"20S_040E\",\"20S_050W\",\"20S_060W\",\"20S_070W\",\"20S_080W\",\"20S_110E\",\"20S_120E\",\"20S_130E\",\"20S_140E\",\"20S_150E\",\"20S_160E\",\"30N_000E\",\"30N_010E\",\"30N_010W\",\"30N_020E\",\"30N_020W\",\"30N_030E\",\"30N_040E\",\"30N_050E\",\"30N_060E\",\"30N_070E\",\"30N_080E\",\"30N_080W\",\"30N_090E\",\"30N_090W\",\"30N_100E\",\"30N_100W\",\"30N_110E\",\"30N_110W\",\"30N_120E\",\"30N_120W\",\"30N_130E\",\"30N_160W\",\"30N_170W\",\"30S_010E\",\"30S_020E\",\"30S_030E\",\"30S_060W\",\"30S_070W\",\"30S_080W\",\"30S_110E\",\"30S_120E\",\"30S_130E\",\"30S_140E\",\"30S_150E\",\"30S_170E\",\"40N_000E\",\"40N_010E\",\"40N_010W\",\"40N_020E\",\"40N_020W\",\"40N_030E\",\"40N_040E\",\"40N_050E\",\"40N_060E\",\"40N_070E\",\"40N_080E\",\"40N_080W\",\"40N_090E\",\"40N_090W\",\"40N_100E\",\"40N_100W\",\"40N_110E\",\"40N_110W\",\"40N_120E\",\"40N_120W\",\"40N_130E\",\"40N_130W\",\"40N_140E\",\"40S_070W\",\"40S_080W\",\"40S_140E\",\"40S_160E\",\"40S_170E\",\"50N_000E\",\"50N_010E\",\"50N_010W\",\"50N_020E\",\"50N_030E\",\"50N_040E\",\"50N_050E\",\"50N_060E\",\"50N_060W\",\"50N_070E\",\"50N_070W\",\"50N_080E\",\"50N_080W\",\"50N_090E\",\"50N_090W\",\"50N_100E\",\"50N_100W\",\"50N_110E\",\"50N_110W\",\"50N_120E\",\"50N_120W\",\"50N_130E\",\"50N_130W\",\"50N_140E\",\"50N_150E\",\"50S_070W\",\"50S_080W\",\"60N_000E\",\"60N_010E\",\"60N_010W\",\"60N_020E\",\"60N_020W\",\"60N_030E\",\"60N_040E\",\"60N_050E\",\"60N_060E\",\"60N_060W\",\"60N_070E\",\"60N_070W\",\"60N_080E\",\"60N_080W\",\"60N_090E\",\"60N_090W\",\"60N_100E\",\"60N_100W\",\"60N_110E\",\"60N_110W\",\"60N_120E\",\"60N_120W\",\"60N_130E\",\"60N_130W\",\"60N_140E\",\"60N_140W\",\"60N_150E\",\"60N_150W\",\"60N_160E\",\"60N_160W\",\"60N_170E\",\"60N_170W\",\"60N_180W\",\"70N_000E\",\"70N_010E\",\"70N_020E\",\"70N_030E\",\"70N_040E\",\"70N_050E\",\"70N_060E\",\"70N_070E\",\"70N_070W\",\"70N_080E\",\"70N_080W\",\"70N_090E\",\"70N_090W\",\"70N_100E\",\"70N_100W\",\"70N_110E\",\"70N_110W\",\"70N_120E\",\"70N_120W\",\"70N_130E\",\"70N_130W\",\"70N_140E\",\"70N_140W\",\"70N_150E\",\"70N_150W\",\"70N_160E\",\"70N_160W\",\"70N_170E\",\"70N_170W\",\"80N_010E\",\"80N_020E\",\"80N_030E\",\"80N_070E\",\"80N_080E\",\"80N_090E\",\"80N_100E\",\"80N_110E\",\"80N_120E\",\"80N_130E\",\"80N_130W\",\"80N_140E\",\"80N_140W\",\"80N_150E\",\"80N_150W\",\"80N_160E\",\"80N_160W\",\"80N_170W\"]\n",
@@ -414,7 +414,7 @@
" count +=1\n",
" submit_result = maap.submitJob(identifier=\"IPCC_classes_ADE\", \n",
" algo_id=\"run_IPCC_classes_ADE\",\n",
- " version=\"IPCC_classes_ADE_v7\",\n",
+ " version=\"IPCC_classes_ADE_v8\",\n",
" username=\"nehajo88\",\n",
" queue=\"maap-dps-worker-32vcpu-64gb\",#\"maap-dps-worker-32gb\",maap-dps-worker-32vcpu-64gb\n",
" FOREST_HEIGHT_2000=\"https://glad.umd.edu/users/Potapov/GLCLUC2020/Forest_height_2000/2000_\" + TILE + \".tif\",\n",
@@ -842,20 +842,20 @@
}
],
"source": [
- "Desired_output_folder = '/projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v7_COG/IPCC_classes/'\n",
+ "Desired_output_folder = '/projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v8_COG/IPCC_classes/'\n",
"if not os.path.exists(Desired_output_folder):\n",
" os.mkdir(Desired_output_folder)\n",
- "SUMMARY_files_tifs = glob.glob('/projects/my-private-bucket/dps_output/run_IPCC_classes_ADE/IPCC_classes_ADE_v7/IPCC_classes_ADE/2024/**/*IPCC*.tif', recursive=True)\n",
+ "SUMMARY_files_tifs = glob.glob('/projects/my-private-bucket/dps_output/run_IPCC_classes_ADE/IPCC_classes_ADE_v8/IPCC_classes_ADE/2024/**/*IPCC*.tif', recursive=True)\n",
"print(\"Moving files...\")\n",
"for each_file in SUMMARY_files_tifs:\n",
" if os.path.exists(each_file) and not os.path.exists(os.path.join(Desired_output_folder,os.path.basename(each_file))): \n",
" print(each_file)\n",
" shutil.move(each_file, Desired_output_folder)\n",
"\n",
- "Desired_output_folder = '/projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v7_COG/Age_classes/'\n",
+ "Desired_output_folder = '/projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v8_COG/Age_classes/'\n",
"if not os.path.exists(Desired_output_folder):\n",
" os.mkdir(Desired_output_folder)\n",
- "SUMMARY_files_tifs = glob.glob('/projects/my-private-bucket/dps_output/run_IPCC_classes_ADE/IPCC_classes_ADE_v7/IPCC_classes_ADE/2024/**/*Age*.tif', recursive=True)\n",
+ "SUMMARY_files_tifs = glob.glob('/projects/my-private-bucket/dps_output/run_IPCC_classes_ADE/IPCC_classes_ADE_v8/IPCC_classes_ADE/2024/**/*Age*.tif', recursive=True)\n",
"print(\"Moving files...\")\n",
"for each_file in SUMMARY_files_tifs:\n",
" if os.path.exists(each_file) and not os.path.exists(os.path.join(Desired_output_folder,os.path.basename(each_file))): \n",
@@ -878,9 +878,9 @@
"metadata": {},
"outputs": [],
"source": [
- "zip -0 /projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v7/IPCC_classes_v6.zip *IPCC*\n",
- "zip -0 /projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v7/Age_classes_v6.zip *Age*\n",
- "zip -0 /projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v7_GPKG/IPCC_classes_v6_GPKG.zip *gpkg*"
+ "zip -0 /projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v8/IPCC_classes_v6.zip *IPCC*\n",
+ "zip -0 /projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v8/Age_classes_v6.zip *Age*\n",
+ "zip -0 /projects/my-public-bucket/Data/Harris_et_al_PAPER/Global_IPCC_classes_ADE_v8_GPKG/IPCC_classes_v6_GPKG.zip *gpkg*"
]
}
],
diff --git a/country_summaries/IPCC_classes_DPS/build_command_main_ADE.sh b/country_summaries/IPCC_classes_DPS/build_command_main_ADE.sh
index 51e6af9..71767cf 100644
--- a/country_summaries/IPCC_classes_DPS/build_command_main_ADE.sh
+++ b/country_summaries/IPCC_classes_DPS/build_command_main_ADE.sh
@@ -3,9 +3,9 @@ set -x
basedir=$( cd "$(dirname "$0")" ; pwd -P )
-conda env update -n base --solver=libmamba -f ${basedir}/env_main_ADE.yaml
+conda env update -n python --solver=libmamba -f ${basedir}/env_main_ADE.yaml
## install to the base env
-conda env update -n base --solver=libmamba -f ${basedir}/env_main_ADE.yaml
+conda env update -n python --solver=libmamba -f ${basedir}/env_main_ADE.yaml
-pip3 install pyOpenSSL --upgrade
+pip3 install pyOpenSSL --upgrade
\ No newline at end of file
diff --git a/country_summaries/IPCC_classes_DPS/env_main_ADE.yaml b/country_summaries/IPCC_classes_DPS/env_main_ADE.yaml
index fa1a571..09bc833 100644
--- a/country_summaries/IPCC_classes_DPS/env_main_ADE.yaml
+++ b/country_summaries/IPCC_classes_DPS/env_main_ADE.yaml
@@ -7,7 +7,8 @@ dependencies:
- memory_profiler==0.61.0 # optional
- pandas>=1.4.1
- numpy>=1.22.3
- - rasterio>=1.2.10
+ - rasterio>=1.3.10
- matplotlib>=3.6.2
- pip:
- - rio-cogeo
\ No newline at end of file
+ - rio-cogeo
+ - git+https://github.com/MAAP-Project/maap-py.git@v4.0.0
\ No newline at end of file
diff --git a/country_summaries/IPCC_classes_DPS/run_IPCC_classes_ADE.yml b/country_summaries/IPCC_classes_DPS/run_IPCC_classes_ADE.yml
index 11b9a64..281e06f 100644
--- a/country_summaries/IPCC_classes_DPS/run_IPCC_classes_ADE.yml
+++ b/country_summaries/IPCC_classes_DPS/run_IPCC_classes_ADE.yml
@@ -1,6 +1,6 @@
algorithm_description: Runs IPCC classes with GEDI
algorithm_name: run_IPCC_classes_ADE
-algorithm_version: IPCC_classes_ADE_v7
+algorithm_version: IPCC_classes_ADE_v8
build_command: biomass_harmonization/country_summaries/IPCC_classes_DPS/build_command_main_ADE.sh
disk_space: 40GB
docker_container_url: mas.maap-project.org/root/maap-workspaces/base_images/python:v4.0.0
--
GitLab