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.

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

Add a geospatial extension #20

Draft
wants to merge 23 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e17c53f
Define an abstract type for the bmi_geo extension
mdpiper Jan 30, 2024
216d907
Implement get_extensions function; add extension string
mdpiper Jan 30, 2024
153273c
Stub the bmi_geo CMake build file
mdpiper Jan 31, 2024
8d19012
Change module name to match bmif
mdpiper Jan 31, 2024
2417582
Follow the naming convention used for bmiheatf library
mdpiper Jan 31, 2024
4117782
Stub the bmi_geospatial extension example
mdpiper Jan 31, 2024
473173b
Add concrete type for bmi_geo
mdpiper Feb 1, 2024
b97489f
Use initialize, not geo_initialize
mdpiper Feb 1, 2024
03ced03
Include the grid parameter in get_grid_coordinate_names and get_grid_…
mdpiper Feb 1, 2024
31ee2ae
Stub out concrete type bmi_heat_geo
mdpiper Feb 1, 2024
3c98318
Move bmi_geo type definition to a separate repository
mdpiper Feb 1, 2024
3aeadf4
Fix error in end function statement
mdpiper Feb 1, 2024
9775ad6
Build extension implementation
mdpiper Feb 1, 2024
349d160
Locate libbmigeof
mdpiper Feb 2, 2024
7d17756
Get parameters from bmif module
mdpiper Feb 2, 2024
914a405
Start writing example main program
mdpiper Feb 2, 2024
2de0471
Set up build for extension example
mdpiper Feb 5, 2024
58193c0
Implement coordinate name, coordinate units, and crs functions
mdpiper Feb 6, 2024
62d161f
Implement get_grid_coordinate function
mdpiper Feb 6, 2024
d3a85cd
Simplify formatting for printing arrays
mdpiper Feb 6, 2024
77407c8
Rename extension implementation from bmiheatgeof to bmigeoheatf
mdpiper Feb 6, 2024
c252d05
Also change name of source on Windows
mdpiper Feb 6, 2024
d4eb7e7
Rename library and entry point in extension string
mdpiper Feb 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Set up build for extension example
mdpiper committed Feb 5, 2024
commit 2de047111205db46614393d5aa03285d526b3a14
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ include(GNUInstallDirs)

set(model_name heatf)
set(bmi_name bmi${model_name})
set(extension_name bmiheatgeof)

# Determine the Fortran BMI version.
if(DEFINED ENV{BMIF_VERSION})
2 changes: 0 additions & 2 deletions bmi_heat/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# bmi-heat

set(extension_name bmiheatgeof)

# Create shared library, except on Windows.
if(WIN32)
add_library(${bmi_name} bmi_heat.f90)
7 changes: 6 additions & 1 deletion example/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -15,4 +15,9 @@ make_example(get_value_ex)
make_example(set_value_ex)
make_example(conflicting_instances_ex)
make_example(change_diffusivity_ex)
make_example(bmi_geospatial_ex)

# Extension example
set(extension_example bmi_geospatial_ex)
add_test(NAME ${extension_example} COMMAND ${extension_example} ${CMAKE_CURRENT_SOURCE_DIR})
add_executable(${extension_example} ${extension_example}.f90 testing_helpers.f90)
target_link_libraries(${extension_example} ${extension_name})