Merge pull request #1085 from xylar/update-to-mpas-tools-1.0.0

Update to mpas tools 1.0.0 and pyremap 2.0.0

Author: xylar

README.md

@@ -54,8 +54,8 @@ environment):
 ``` bash
 conda config --add channels conda-forge
 conda config --set channel_priority strict
-conda create -y -n mpas_dev --file dev-spec.txt
-conda activate mpas_dev
+conda create -y -n mpas_analysis_dev --file dev-spec.txt
+conda activate mpas_analysis_dev
 python -m pip install --no-deps --no-build-isolation -e .
 ```
 
@@ -64,16 +64,16 @@ for MPAS-Tools or geometric\_features), you should first comment out the other
 package in `dev-spec.txt`.  Then, you can install both packages in the same
 development environment, e.g.:
 ``` bash
-conda create -y -n mpas_dev --file tools/MPAS-Tools/conda_package/dev-spec.txt \
+conda create -y -n mpas_analysis_dev --file tools/MPAS-Tools/conda_package/dev-spec.txt \
     --file analysis/MPAS-Analysis/dev-spec.txt
-conda activate mpas_dev
+conda activate mpas_analysis_dev
 cd tools/MPAS-Tools/conda_package
 python -m pip install --no-deps --no-build-isolation -e .
 cd ../../../analysis/MPAS-Analysis
 python -m pip install --no-deps --no-build-isolation -e .
 ```
 Obviously, the paths to the repos may be different in your local clones.  With
-the `mpas_dev` environment as defined above, you can make changes to both
+the `mpas_analysis_dev` environment as defined above, you can make changes to both
 `mpas_tools` and `mpas-analysis` packages in their respective branches, and
 these changes will be reflected when refer to the packages or call their
 respective entry points (command-line tools).

ci/recipe/meta.yaml

@@ -32,15 +32,15 @@ requirements:
     - lxml
     - mache >=1.11.0
     - matplotlib-base >=3.9.0
-    - mpas_tools >=0.34.1,<1.0.0
+    - mpas_tools >=1.0.0,<2.0.0
     - nco >=4.8.1,!=5.2.6
     - netcdf4
     - numpy >=2.0,<3.0
     - pandas
     - pillow >=10.0.0,<11.0.0
     - progressbar2
     - pyproj
-    - pyremap >=1.2.0,<2.0.0
+    - pyremap >=2.0.0,<3.0.0
     - python-dateutil
     - requests
     - scipy >=1.7.0

configs/alcf/job_script.cooley.bash

@@ -6,7 +6,7 @@
 source /lus/theta-fs0/projects/ccsm/acme/tools/e3sm-unified/load_latest_e3sm_unified_cooley.sh
 # alternatively, you can load your own development environment
 # source ~/mambaforge/etc/profile.d/conda.sh
-# conda activate mpas_dev
+# conda activate mpas_analysis_dev
 # export E3SMU_MACHINE=cooley
 
 export HDF5_USE_FILE_LOCKING=FALSE

configs/compy/job_script.compy.bash

@@ -11,7 +11,7 @@ export OMP_NUM_THREADS=1
 source /share/apps/E3SM/conda_envs/load_latest_e3sm_unified_compy.sh
 # alternatively, you can load your own development environment
 # source ~/mambaforge/etc/profile.d/conda.sh
-# conda activate mpas_dev
+# conda activate mpas_analysis_dev
 # export E3SMU_MACHINE=compy
 
 export HDF5_USE_FILE_LOCKING=FALSE

configs/job_script.default.bash

@@ -8,7 +8,7 @@
 export OMP_NUM_THREADS=1
 
 source ~/mambaforge/etc/profile.d/conda.sh
-conda activate mpas_dev
+conda activate mpas_analysis_dev
 # if you are on an E3SM supported machine, you can specify it:
 # export E3SMU_MACHINE=chrysalis
 

configs/lanl/job_script.lanl.bash

@@ -8,7 +8,7 @@
 
 source /users/xylar/climate/mambaforge/etc/profile.d/conda.sh
 source /users/xylar/climate/mambaforge/etc/profile.d/mamba.sh
-mamba activate mpas_dev
+mamba activate mpas_analysis_dev
 
 export HDF5_USE_FILE_LOCKING=FALSE
 

configs/lcrc/job_script.anvil.bash

@@ -12,7 +12,7 @@ export OMP_NUM_THREADS=1
 source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_anvil.sh
 # alternatively, you can load your own development environment
 # source ~/mambaforge/etc/profile.d/conda.sh
-# conda activate mpas_dev
+# conda activate mpas_analysis_dev
 # export E3SMU_MACHINE=anvil
 
 export HDF5_USE_FILE_LOCKING=FALSE

configs/lcrc/job_script.chrysalis.bash

@@ -10,7 +10,7 @@ export OMP_NUM_THREADS=1
 source /lcrc/soft/climate/e3sm-unified/load_latest_e3sm_unified_chrysalis.sh
 # alternatively, you can load your own development environment
 # source ~/mambaforge/etc/profile.d/conda.sh
-# conda activate mpas_dev
+# conda activate mpas_analysis_dev
 # export E3SMU_MACHINE=chrysalis
 
 export HDF5_USE_FILE_LOCKING=FALSE

configs/nersc/job_script.cori-haswell.bash

@@ -20,7 +20,7 @@ export OMP_NUM_THREADS=1
 source /global/common/software/e3sm/anaconda_envs/load_latest_e3sm_unified_cori-haswell.sh
 # alternatively, you can load your own development environment
 # source ~/mambaforge/etc/profile.d/conda.sh
-# conda activate mpas_dev
+# conda activate mpas_analysis_dev
 # export E3SMU_MACHINE=cori-haswell
 
 export HDF5_USE_FILE_LOCKING=FALSE

configs/nersc/job_script.cori-knl.bash

@@ -20,7 +20,7 @@ export OMP_NUM_THREADS=1
 source /global/common/software/e3sm/anaconda_envs/load_latest_e3sm_unified_cori-knl.sh
 # alternatively, you can load your own development environment
 # source ~/mambaforge/etc/profile.d/conda.sh
-# conda activate mpas_dev
+# conda activate mpas_analysis_dev
 # export E3SMU_MACHINE=cori-knl
 
 export HDF5_USE_FILE_LOCKING=FALSE