Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Bmi class in bmipy 2.0 #62

Merged
merged 27 commits into from
Mar 12, 2020
Merged

Update to Bmi class in bmipy 2.0 #62

merged 27 commits into from
Mar 12, 2020

Conversation

sverhoeven
Copy link
Member

@sverhoeven sverhoeven self-assigned this Mar 11, 2020
@sverhoeven
Pin to v1.27.2 version of grpc
dfe31e3 
Otherwise v1.28.0rc3 is installed, which is a pre-release
@sverhoeven
Grpc install instructions changed from make to cmake
f4c364a 
As make was deprecated, see https://github.com/grpc/grpc/blob/master/BUILDING.md#building-with-make-on-unix-systems-deprecated
@sverhoeven
Regenerated Python gRPC code
0c63fef
@sverhoeven
Update Python client/server to updated interface
c99f10c
@sverhoeven
Update tests for client and server
9012175 
Also switched to unstructured grid model based on https://bmi.readthedocs.io/en/latest/model_grids.html#unstructured-grids
@sverhoeven
Replaced https://github.com/csdms/bmi Git submodule with bmi-c and bm…
f74306b 
…i-cxx ones
@sverhoeven
Sync c++ server with proto file
dc13485
@sverhoeven
Trying to sync our c++ code to updated bmi.h and bmi.hxx
680bd81
@sverhoeven
Debugging Travis-CI build
2b105af
@sverhoeven
Copy link
Member Author

@goord I tried to get c++ code to work with the updated bmi.hxx and bmi.h, but got stuck in the C wrapper. Could you have a look?

goord
goord approved these changes Mar 11, 2020
View reviewed changes
Copy link
Collaborator

@goord goord left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was about to do this to fix the documentation

@goord
Copy link
Collaborator

goord commented Mar 11, 2020

Due to the new and improved C++ BMI interface, our BmiCppExtension is redundant. The wrapper itself can stay, it should just wrap the C struct into the BMI C++ class

@goord goord marked this pull request as ready for review March 11, 2020 15:19
goord
goord reviewed Mar 11, 2020
View reviewed changes
cpp/bmi_cpp_extension.cc Outdated Show resolved Hide resolved
@sverhoeven
Copy link
Member Author

Got a bit further, now the test_bmi_cpp_extension compilation is complaining. Need to sync it with the rest.

@sverhoeven
Copy link
Member Author

test_bmi_cpp_extension tests now run, but the test_bmi_grpc_server is having compilation problems.

@goord
Copy link
Collaborator

goord commented Mar 12, 2020

test_bmi_cpp_extension tests now run, but the test_bmi_grpc_server is having compilation problems.

I will try to fix this

@sverhoeven sverhoeven assigned goord and unassigned sverhoeven Mar 12, 2020
@goord goord merged commit 0f5d8d4 into master Mar 12, 2020
@sverhoeven
Copy link
Member Author

Nice

@goord goord deleted the bmi-catchup branch March 12, 2020 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@goord goord goord approved these changes

Assignees

@goord goord

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Master branch test fails due to Bmi interface changes
2 participants
@sverhoeven @goord