Rename extension implementation from bmiheatgeof to bmigeoheatf

Author: mdpiper

CMakeLists.txt

@@ -11,7 +11,7 @@ include(GNUInstallDirs)
 
 set(model_name heatf)
 set(bmi_name bmi${model_name})
-set(extension_name bmiheatgeof)
+set(extension_name bmigeo${model_name})
 
 # Determine the Fortran BMI version.
 if(DEFINED ENV{BMIF_VERSION})

bmi_heat/CMakeLists.txt

@@ -6,7 +6,7 @@ if(WIN32)
   add_library(${extension_name} bmi_heat_geo.f90)
 else()
   add_library(${bmi_name} SHARED bmi_heat.f90)
-  add_library(${extension_name} SHARED bmi_heat_geo.f90)
+  add_library(${extension_name} SHARED bmi_geo_heat.f90)
 endif()
 target_link_libraries(${bmi_name} ${model_name} ${bmif_lib})
 target_link_libraries(${extension_name} ${bmi_name} ${bmigeof_lib})

bmi_heat/bmi_heat_geo.f90 renamed to bmi_heat/bmi_geo_heat.f90

@@ -1,36 +1,36 @@
-! Implement the bmi_geo type and use the bmi_heat type in a new type, bmi_heat_geo
+! Implement the bmi_geo type and use the bmi_heat type in a new type, bmi_geo_heat
 
-module bmiheatgeof
+module bmigeoheatf
 
     use bmigeof
     use bmiheatf
     use bmif_2_0
     implicit none
 
-    type, extends (bmi_geo) :: bmi_heat_geo
+    type, extends (bmi_geo) :: bmi_geo_heat
         type (bmi_heat) :: bmi_base
     contains
         procedure :: initialize => heat_initialize
         procedure :: get_grid_coordinate_names => heat_grid_coordinate_names
         procedure :: get_grid_coordinate_units => heat_grid_coordinate_units
         procedure :: get_grid_coordinate => heat_grid_coordinate
         procedure :: get_grid_crs => heat_grid_crs
-    end type bmi_heat_geo
+    end type bmi_geo_heat
 
-    public bmi_heat_geo
+    public bmi_geo_heat
 
 contains
 
     function heat_initialize(this, config_file) result (bmi_status)
-        class (bmi_heat_geo), intent(out) :: this
+        class (bmi_geo_heat), intent(out) :: this
         character (len=*), intent(in) :: config_file
         integer :: bmi_status
 
         bmi_status = BMI_SUCCESS
     end function heat_initialize
 
     function heat_grid_coordinate_names(this, grid, names) result (bmi_status)
-        class (bmi_heat_geo), intent(in) :: this
+        class (bmi_geo_heat), intent(in) :: this
         integer, intent(in) :: grid
         character (*), pointer, intent(out) :: names(:)
         integer :: bmi_status
@@ -42,7 +42,7 @@ function heat_grid_coordinate_names(this, grid, names) result (bmi_status)
     end function heat_grid_coordinate_names
 
     function heat_grid_coordinate_units(this, grid, units) result (bmi_status)
-        class (bmi_heat_geo), intent(in) :: this
+        class (bmi_geo_heat), intent(in) :: this
         integer, intent(in) :: grid
         character (*), pointer, intent(out) :: units(:)
         integer :: bmi_status
@@ -54,7 +54,7 @@ function heat_grid_coordinate_units(this, grid, units) result (bmi_status)
     end function heat_grid_coordinate_units
 
     function heat_grid_coordinate(this, grid, coordinate, values) result (bmi_status)
-        class (bmi_heat_geo), intent(in) :: this
+        class (bmi_geo_heat), intent(in) :: this
         integer, intent(in) :: grid
         character(len=*), intent(in) :: coordinate
         double precision, dimension(:), intent(out) :: values
@@ -84,7 +84,7 @@ function heat_grid_coordinate(this, grid, coordinate, values) result (bmi_status
     end function heat_grid_coordinate
 
     function heat_grid_crs(this, grid, crs) result (bmi_status)
-        class (bmi_heat_geo), intent(in) :: this
+        class (bmi_geo_heat), intent(in) :: this
         integer, intent(in) :: grid
         character (len=*), intent(out) :: crs
         integer :: bmi_status
@@ -93,4 +93,4 @@ function heat_grid_crs(this, grid, crs) result (bmi_status)
         bmi_status = BMI_SUCCESS
     end function heat_grid_crs
 
-end module bmiheatgeof
+end module bmigeoheatf

example/bmi_geospatial_ex.f90

@@ -3,11 +3,11 @@ program bmi_geospatial_ex
 
     use bmif_2_0
     use bmiheatf
-    use bmiheatgeof
+    use bmigeoheatf
     implicit none
 
     type(bmi_heat) :: h
-    type(bmi_heat_geo) :: g
+    type(bmi_geo_heat) :: g
     integer :: status, grid_id, grid_rank, i
     character (len=BMI_MAX_COMPONENT_NAME), pointer :: component_name
     integer, allocatable :: grid_shape(:)
@@ -30,7 +30,7 @@ program bmi_geospatial_ex
     status = h%get_grid_shape(grid_id, grid_shape)
     write (*,"(a, *(x, i3))") "Grid shape:", grid_shape
 
-    g = bmi_heat_geo(h)
+    g = bmi_geo_heat(h)
 
     allocate(names(grid_rank))
     status = g%get_grid_coordinate_names(grid_id, names)