Merge more changes from develop (#111)

* Revert to develop status

* Fix bugs in getting wrf domain

* Version to 0.2.2 and update NEWS.md

* Fix some indenting and ordering in define_harp_params()

R/harp_params.R

@@ -162,7 +162,7 @@ define_harp_params <- function() {
       fa = list(
         name  = pad_string("CLSMAXI.TEMPERAT", 16),
         units = "K"
-),
+      ),
 
       obsoul = list(
         name = 82,
@@ -456,7 +456,7 @@ define_harp_params <- function() {
 
       func = function(u, v) sqrt(u ^ 2 + v ^ 2)
 
-     ),
+    ),
     ###
 
     d10m = list(
@@ -1163,7 +1163,7 @@ define_harp_params <- function() {
       fa = list(
         name  = pad_string("SURFNEBUL.TOTALE", 16),
         units = "fraction"
-),
+      ),
 
       obsoul = list(
         name = 91,
@@ -1371,13 +1371,13 @@ define_harp_params <- function() {
         name        = "PE1",
         param_units = "kg/m^2",
         type        = "SYNOP"
-),
+      ),
 
       obsoul = list(
         name = 79,
         units = "mm",
         harp_name = "AccPcp1h"
-        
+
       )
     ),
     ###
@@ -1410,7 +1410,7 @@ define_harp_params <- function() {
         name        = "PE6",
         param_units = "kg/m^2",
         type        = "SYNOP"
-),
+      ),
 
       obsoul = list(
         name = 80,
@@ -1453,6 +1453,17 @@ define_harp_params <- function() {
     ),
     ###
 
+    snow = list(
+
+      description = "Snow depth",
+
+      obsoul = list(
+        name      = 92,
+        units     = "cm",
+        harp_name = "Snow"
+      )
+    ),
+
     ################
     ### PRESSURE ###
     ################
@@ -1766,21 +1777,10 @@ define_harp_params <- function() {
         units = "J/kg"
       )
 
-    ),
+    )
     ###
 
-      snow = list (
-
-      description = "Snow depth",	
-
-      obsoul = list(
-	      name      = 92,
-        units     = "cm",
-        harp_name = "Snow"		
-
-	  )
   )
-)
 
 }
 

R/show_param_defs.R

@@ -34,7 +34,7 @@ show_param_defs <- function(
     }
 
     if (file_format == "fa") {
-      stop("Doesn't work FA params yet", call. = FALSE)
+      stop("Doesn't work for FA params yet", call. = FALSE)
     }
 
     params <- dplyr::arrange(