diff --git a/.ipynb_checkpoints/build-env-checkpoint.sh b/.ipynb_checkpoints/build-env-checkpoint.sh index 802ebb20cbf1087da0c2094c1df0a63a25261e96..81d333cd40e044f83a5e00059a7a6d936a0a93cc 100644 --- a/.ipynb_checkpoints/build-env-checkpoint.sh +++ b/.ipynb_checkpoints/build-env-checkpoint.sh @@ -3,17 +3,12 @@ # source activate base basedir=$( cd "$(dirname "$0")" ; pwd -P) echo installing environment... -mamba env create --name osgeo-env -f ${basedir}/environment.yml -# conda create --name osgeo-env --clone base -# source activate osgeo-env -# mamba install -c conda-forge scipy -y -# mamba install -c conda-forge h5py -y -# mamba install -c conda-forge geopandas -y +conda env create --name osgeo-env -f ${basedir}/environment.yml # Install the maap.py environment echo trying to install maap-py... source activate osgeo-env -git clone --single-branch --branch v3.0.1 https://github.com/MAAP-Project/maap-py.git +git clone --single-branch --branch v4.1.0 https://github.com/MAAP-Project/maap-py.git cd maap-py pip install -e . echo installed maap-py package! diff --git a/.ipynb_checkpoints/main-checkpoint.py b/.ipynb_checkpoints/main-checkpoint.py index 802d7c72e5eb4a306eba765a52f246eba3232ddb..c416625762d39015e502146348b030cc0ae6e9f8 100644 --- a/.ipynb_checkpoints/main-checkpoint.py +++ b/.ipynb_checkpoints/main-checkpoint.py @@ -186,8 +186,19 @@ if __name__ == '__main__': biFP_list = [] gap_list = [] lai_list = [] - rh_list = [] cval_list = [] + rh98_list = [] + rh95_list = [] + rh90_list = [] + rh85_list = [] + rh80_list = [] + rh75_list = [] + rh70_list = [] + rh65_list = [] + rh60_list = [] + rh55_list = [] + rh50_list = [] + print("Running pgap iteratively...") for i in idx: results = gedi_bioindex(i) diff --git a/.ipynb_checkpoints/run-checkpoint.sh b/.ipynb_checkpoints/run-checkpoint.sh index 047fbb54049c4ec327b937634a0187c682f4a9ef..d6d50b983353cd67147e61234b4ac219c944a8b4 100644 --- a/.ipynb_checkpoints/run-checkpoint.sh +++ b/.ipynb_checkpoints/run-checkpoint.sh @@ -5,6 +5,7 @@ basedir=$( cd "$(dirname "$0")" ; pwd -P) # Activate environment that was created in the builed-env.sh file source activate osgeo-env +# source activate /projects/env/osgeo-env # Create output dir # OUTPUTDIR="${PWD}/output" @@ -14,4 +15,4 @@ L1B_URL=$1 L2A_URL=$2 # e.g. GEDI01_B or GEDI02_A # YR=$3 # python ${basedir}/main.py ${L1B_URL} ${L2A_URL} ${OUTPUTDIR} -python ${basedir}/main.py ${L1B_URL} ${L2A_URL} output +python ${basedir}/main.py ${L1B_URL} ${L2A_URL} output \ No newline at end of file diff --git a/__pycache__/get_gedi_data.cpython-310.pyc b/__pycache__/get_gedi_data.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..978c71c87edf4e10ef04cc5847400445e803ea82 Binary files /dev/null and b/__pycache__/get_gedi_data.cpython-310.pyc differ diff --git a/__pycache__/pgap.cpython-310.pyc b/__pycache__/pgap.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..0d0df8c0667b87e1a104de112cb7196ee28f0ca6 Binary files /dev/null and b/__pycache__/pgap.cpython-310.pyc differ diff --git a/build-env.sh b/build-env.sh index 56bface66c88382a13e4fa2edbd84ab18a20d157..81d333cd40e044f83a5e00059a7a6d936a0a93cc 100644 --- a/build-env.sh +++ b/build-env.sh @@ -8,7 +8,7 @@ conda env create --name osgeo-env -f ${basedir}/environment.yml # Install the maap.py environment echo trying to install maap-py... source activate osgeo-env -git clone --single-branch --branch v3.1.4 https://github.com/MAAP-Project/maap-py.git +git clone --single-branch --branch v4.1.0 https://github.com/MAAP-Project/maap-py.git cd maap-py pip install -e . echo installed maap-py package! diff --git a/main.py b/main.py index 802d7c72e5eb4a306eba765a52f246eba3232ddb..c416625762d39015e502146348b030cc0ae6e9f8 100644 --- a/main.py +++ b/main.py @@ -186,8 +186,19 @@ if __name__ == '__main__': biFP_list = [] gap_list = [] lai_list = [] - rh_list = [] cval_list = [] + rh98_list = [] + rh95_list = [] + rh90_list = [] + rh85_list = [] + rh80_list = [] + rh75_list = [] + rh70_list = [] + rh65_list = [] + rh60_list = [] + rh55_list = [] + rh50_list = [] + print("Running pgap iteratively...") for i in idx: results = gedi_bioindex(i) diff --git a/run.sh b/run.sh index 047fbb54049c4ec327b937634a0187c682f4a9ef..d6d50b983353cd67147e61234b4ac219c944a8b4 100644 --- a/run.sh +++ b/run.sh @@ -5,6 +5,7 @@ basedir=$( cd "$(dirname "$0")" ; pwd -P) # Activate environment that was created in the builed-env.sh file source activate osgeo-env +# source activate /projects/env/osgeo-env # Create output dir # OUTPUTDIR="${PWD}/output" @@ -14,4 +15,4 @@ L1B_URL=$1 L2A_URL=$2 # e.g. GEDI01_B or GEDI02_A # YR=$3 # python ${basedir}/main.py ${L1B_URL} ${L2A_URL} ${OUTPUTDIR} -python ${basedir}/main.py ${L1B_URL} ${L2A_URL} output +python ${basedir}/main.py ${L1B_URL} ${L2A_URL} output \ No newline at end of file