search

GCEL / CARDAMOM

The CARbon DAta MOdel FraMework. Computer software that retrieves terrestrial carbon (C) cycle variables by combining C cycle observations with a mass balance model.
GNU General Public License v3.0
2 stars 0 forks source link

CARDAMOM python version #6

Closed vmyrgiotis closed 6 years ago

vmyrgiotis commented 6 years ago

Is there a working python version of CARDAMOM that could be added here? @lsmallma @jfexbrayat

lsmallma commented 6 years ago

I think Jeff’s python version can be found under his CARDAMOM branch on Github

Thanks, Luke

Dr T. Luke Smallman PDRA (GREENHOUSE / Forests2020)

School of GeoSciences, Crew Building, King’s Buildings, University of Edinburgh, EH9 3JN, UK Edinburgh

On 11 Oct 2018, at 11:54, vmyrgiotis notifications@github.com<mailto:notifications@github.com> wrote:

Is there a working python version of CARDAMOM that could be added here? @lsmallmahttps://github.com/lsmallma @jfexbrayathttps://github.com/jfexbrayat

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://github.com/GCEL/CARDAMOM/issues/6, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AYc3DXyugyOlsUm45NJAfBClTrKoeGdbks5ujyNVgaJpZM4XXSZh.

The University of Edinburgh is a charitable body, registered in Scotland, with registration number SC005336.

dvalters commented 6 years ago

Just as a friendly git(hub) pointer - 'branches' are not really intended to be permanent stores of versions/configurations of a program/software - otherwise they become divergent from the main master branch and difficult to maintain. They are ideally meant for feature development, and get merged back to the master branch via a Pull Request. The branch is then deleted once it is merged back into master.

jfexbrayat commented 6 years ago

We should work on merging my branch with the master before @vmyrgiotis creates his own branch to add his own new features. I don't think there should be much overlap between the current master and my branch as I've mostly added new files corresponding to the Python framework. Let's have a go at it next week @dvalters ?

dvalters commented 6 years ago

@jfexbrayat Yep sounds good - I can pencil in some time for next week to help merge it. Just create the Pull request when you're ready and git will show us where the conflicts are if there are (m)any.

jfexbrayat commented 6 years ago

hey @vmyrgiotis we have successfully merged the branch 'jeff' into the master if you want to start using it

dvalters commented 6 years ago

Issue resolved by pull request at #7