Merge branch '66-bugfix_ogs641_minor' into 'master'

Resolve "ogs6.4.1 - Minor Bugfixes"

Closes #66

See merge request !48

R/prj_borehole_heat_exchanger.R

@@ -47,7 +47,7 @@ new_prj_borehole_heat_exchanger <- function(type,
     borehole <- coerce_names(borehole, c("length", "diameter"))
     grout <- coerce_names(grout, c("density",
                                    "porosity",
-                                   "heat_capacity",
+                                   "specific_heat_capacity",
                                    "thermal_conductivity"))
 
     assertthat::assert_that(class(pipes) == "prj_pipes")

R/prj_medium.R

@@ -318,7 +318,7 @@ new_prj_pr_property <- function(name,
                    exponents = exponents,
                    xpath = "media/medium/properties/property",
                    attr_names = character(),
-                   flatten_on_exp = character()
+                   flatten_on_exp = c("value")
     ),
     class = "prj_pr_property"
     )

R/prj_parameter.R

@@ -135,7 +135,7 @@ new_prj_parameter <- function(name,
                    seed = seed,
                    xpath = "parameters/parameter",
                    attr_names = character(),
-                   flatten_on_exp = c("values"),
+                   flatten_on_exp = c("values", "range"),
                    unwrap_on_exp = c("index_values", "expression")
     ),
     class = "prj_parameter"

R/prj_time_loop.R

@@ -495,18 +495,21 @@ validate_timesteps <- function(timesteps, in_output = FALSE){
 
         #Coerce input
         if(assertthat::is.string(timesteps[[i]][[1]])){
-            timesteps[[i]][[1]] <- as.double(timesteps[[i]][[1]])
-        }
-
-        if(assertthat::is.string(timesteps[[i]][[2]])){
-            timesteps[[i]][[2]] <- as.double(timesteps[[i]][[2]])
+            timesteps[[i]][[1]] <- as.integer(timesteps[[i]][[1]])
         }
 
         if(!in_output){
             names(timesteps[[i]])[[2]] <- "delta_t"
+            if(assertthat::is.string(timesteps[[i]][[2]])){
+                timesteps[[i]][[2]] <- as.double(timesteps[[i]][[2]])
+            }
         }else{
             names(timesteps[[i]])[[2]] <- "each_steps"
+            if(assertthat::is.string(timesteps[[i]][[2]])){
+                timesteps[[i]][[2]] <- as.integer(timesteps[[i]][[2]])
+            }
         }
+
     }
 
     names(timesteps) <- rep("pair", length(timesteps))