address reviewer comments

NCAR · Nov 5, 2024 · 948ee2d · 948ee2d
1 parent 13327bf
commit 948ee2d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/fortran/micm.F90 b/fortran/micm.F90
@@ -10,7 +10,7 @@ module musica_micm
   implicit none
 
   public :: micm_t, solver_stats_t, get_micm_version
-  public :: Rosenbrock, RosenbrockStandardOrder, BackwardEuler, BackwardEulerStandardOrder
+  public :: UndefinedSolver, Rosenbrock, RosenbrockStandardOrder, BackwardEuler, BackwardEulerStandardOrder
   private
 
   !> Wrapper for c solver stats
@@ -28,6 +28,7 @@ module musica_micm
   ! We could use Fortran 2023 enum type feature if Fortran 2023 is supported
   ! https://fortran-lang.discourse.group/t/enumerator-type-in-bind-c-derived-type-best-practice/5947/2
   enum, bind(c)
+    enumerator :: UndefinedSolver            = 0
     enumerator :: Rosenbrock                 = 1
     enumerator :: RosenbrockStandardOrder    = 2
     enumerator :: BackwardEuler              = 3
@@ -137,7 +138,7 @@ end function get_user_defined_reaction_rates_ordering_c
     type(mappings_t), pointer :: user_defined_reaction_rates => null()
     type(c_ptr), private      :: ptr = c_null_ptr
     integer,     private      :: number_of_grid_cells = 0
-    integer,     private      :: solver_type = 0
+    integer,     private      :: solver_type = UndefinedSolver
   contains
     ! Solve the chemical system
     procedure, private :: solve_arrays

diff --git a/fortran/test/fetch_content_integration/test_micm_box_model.F90 b/fortran/test/fetch_content_integration/test_micm_box_model.F90
@@ -19,8 +19,8 @@ program test_micm_box_model
   subroutine box_model_arrays()
 
     character(len=256) :: config_path
-    integer(c_int)     :: solver_type
-    integer(c_int)     :: num_grid_cells
+    integer            :: solver_type
+    integer            :: num_grid_cells
 
     real(real64), parameter :: GAS_CONSTANT = 8.31446261815324_real64 ! J mol-1 K-1
 
@@ -72,8 +72,8 @@ end subroutine box_model_arrays
   subroutine box_model_c_ptrs()
 
     character(len=256) :: config_path
-    integer(c_int)     :: solver_type
-    integer(c_int)     :: num_grid_cells
+    integer            :: solver_type
+    integer            :: num_grid_cells
 
     real(real64), parameter :: GAS_CONSTANT = 8.31446261815324_real64 ! J mol-1 K-1
 

diff --git a/include/musica/micm.hpp b/include/musica/micm.hpp
@@ -41,7 +41,8 @@ namespace musica
     /// @brief Types of MICM solver
     enum MICMSolver
     {
-      Rosenbrock = 1,              // Vector-ordered Rosenbrock solver
+      UndefinedSolver = 0,         // Undefined solver
+      Rosenbrock,                  // Vector-ordered Rosenbrock solver
       RosenbrockStandardOrder,     // Standard-ordered Rosenbrock solver
       BackwardEuler,               // Vector-ordered BackwardEuler solver
       BackwardEulerStandardOrder,  // Standard-ordered BackwardEuler solver