2.11 version PR (#248)

2.11 Version

.github/workflows/build_push_docker.yml

@@ -1,6 +1,9 @@
 
 name: Docker
-on: [push]
+on: 
+  push:
+    branches:
+      - master
 
 jobs:
   build:

.github/workflows/conda_deploy.yml

@@ -0,0 +1,33 @@
+name: Conda Deployment 
+
+on:
+  release:
+    types: [created, edited]
+  workflow_dispatch:
+
+jobs:
+
+  conda_build_test:
+    name: Conda Build (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest", "macos-latest"]
+        python-version: ["3.7", "3.8"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          auto-update-conda: true
+          python-version: ${{ matrix.python-version }}
+      - name: Conda Upload
+        shell: bash -l {0}
+        run: |
+            conda install --channel conda-forge conda-build anaconda-client conda-verify
+            conda config --add channels conda-forge
+            conda config --add channels underworldcode
+            conda config --set anaconda_upload yes
+            anaconda login --hostname github-actions-${{ matrix.os  }}-$RANDOM --username ${{ secrets.ANACONDA_USERNAME }} --password ${{ secrets.ANACONDA_PASSWORD }}
+            conda-build --channel conda-forge --user geo-down-under conda
+            anaconda logout

.github/workflows/pypi_deployer.yml

@@ -1,8 +1,8 @@
 name: pypi deployer
 on:
-  push
-    #tags:
-    # - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+  push:
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 jobs:
   #Release new version on github releases
   # Github-release:

.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
   test_in_UW_Container:
     runs-on: ubuntu-latest
     container:
-      image: underworldcode/underworld2:2.10.0b
+      image: underworldcode/underworld2:latest
       options: --user root
     steps:
       - name: Test in UW Container
@@ -17,4 +17,4 @@ jobs:
           # git checkout development
           pip install -e .
           pip install pytest
-          python -m pytest -vvv
+          python -m pytest -vvv

CHANGELOG.md

@@ -1,8 +1,14 @@
-# Version 2.10
 
+# Version 2.11
 
-- Layer2D which has now been deprecated for a while has been removed
+- Change Passive Tracers Interface. The ``Model.add_passive_tracers`` method now return ``None``. Tracers can be accessed via the Model object. This is to avoid orphans and usage errors when doing a restart.
+- Add option to pass UW function (or mesh variable) to the density material properties.
+- `Model.init_model()` excepts arguments to optional to initiliase temperature and pressure fields with an UW function or a mesh variable.
+- Various bug fixes.
 
+# Version 2.10
+
+- Layer2D which has now been deprecated for a while has been removed
 
 # Version 2.9
 

Dockerfile

@@ -1,6 +1,6 @@
 # Stage 1: Inherit from underworldcode/underworld2:2.10.0b and install dependency packages for Badlands
 ##########
-FROM underworldcode/underworld2:2.10.0b as base_runtime
+FROM underworldcode/underworld2:2.11.0b as base_runtime
 MAINTAINER https://github.com/underworldcode/
 # install runtime requirements
 USER root

README.md

@@ -9,7 +9,7 @@
 [![Docs](https://readthedocs.org/projects/uwgeodynamics/badge)](http://uwgeodynamics.readthedocs.org/)
 ![tests](https://github.com/underworldcode/UWGeodynamics/workflows/tests/badge.svg)
 
-[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/rbeucher/UWGeodynamics-binder/master)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/underworldcode/UWGeodynamics.git/master)
 
 ![image](docs/tutorials/images/Tutorial1.gif)
 ![image](docs/readthedocs/src/img/collision_wedge.gif)

UWGeodynamics/LecodeIsostasy/LecodeIsostasy.py

@@ -498,8 +498,8 @@ def _get_average_densities2D(self):
         # data_nodegId as domain size (local+node) so we need to only take
         # the local nodes otherwise the reduce operation will results in higher
         # values where domains overlaps...
-        local_densities[self.mesh.data_nodegId[:self.mesh.nodesLocal]] = self.DensityVar.data[:self.mesh.nodesLocal]
-        local_materials[self.mesh.data_nodegId[:self.mesh.nodesLocal]] = self.MaterialVar.data[:self.mesh.nodesLocal]
+        local_densities[self.mesh.data_nodegId[:self.mesh.nodesLocal]] = self.DensityVar.data[:self.mesh.nodesLocal, 0]
+        local_materials[self.mesh.data_nodegId[:self.mesh.nodesLocal]] = self.MaterialVar.data[:self.mesh.nodesLocal, 0]
 
         # Reduce local_densities arrays to global_densities
         comm.Allreduce(local_densities, global_densities)
@@ -558,8 +558,8 @@ def _get_average_densities3D(self):
         global_materials = np.zeros((nx+1)*(ny+1)*(nz+1))
 
         # Load the densities and material into the local_densities arrays
-        local_densities[self.mesh.data_nodegId[:self.mesh.nodesLocal]] = self.DensityVar.data[:self.mesh.nodesLocal]
-        local_materials[self.mesh.data_nodegId[:self.mesh.nodesLocal]] = self.MaterialVar.data[:self.mesh.nodesLocal]
+        local_densities[self.mesh.data_nodegId[:self.mesh.nodesLocal]] = self.DensityVar.data[:self.mesh.nodesLocal, 0]
+        local_materials[self.mesh.data_nodegId[:self.mesh.nodesLocal]] = self.MaterialVar.data[:self.mesh.nodesLocal, 0]
 
         # Reduce local_densities arrays to global_densities
         comm.Allreduce(local_densities, global_densities)