Merge branch 'read_kill_ocean_mask_1.0' into pism_pik_1.0

pism · Nov 22, 2017 · 06abcaf · 06abcaf
2 parents ab62650 + 40e3743
commit 06abcaf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/calving/OceanKill.cc b/src/calving/OceanKill.cc
@@ -57,8 +57,7 @@ void OceanKill::init() {
     throw RuntimeError(PISM_ERROR_LOCATION, "option -ocean_kill_file is required.");
   }
 
-  bool ocean_kill_mask_set = options::Bool("-ocean_kill_mask",
-                                           "Specifies that ocean_kill mask is read from file");
+  bool ocean_kill_mask_set = m_config->get_boolean("calving.ocean_kill.mask_set");
 
   if (ocean_kill_mask_set) {
 

diff --git a/src/pism_config.cdl b/src/pism_config.cdl
@@ -339,6 +339,11 @@ netcdf pism_config {
     pism_config:calving.vonmises.sigma_max_type = "scalar";
     pism_config:calving.vonmises.sigma_max_units = "Pa";
 
+    pism_config:calving.ocean_kill.mask_set = "false";
+    pism_config:calving.ocean_kill.mask_set_doc = "Specifies that ocean_kill mask is read from file";
+    pism_config:calving.ocean_kill.mask_set_option = "ocean_kill_mask";
+    pism_config:calving.ocean_kill.mask_set_type = "boolean";
+
     pism_config:climate_forcing.buffer_size = 60;
     pism_config:climate_forcing.buffer_size_doc = "number of 2D climate forcing records to keep in memory; = 5 years of monthly records";
     pism_config:climate_forcing.buffer_size_type = "integer";