Merge pull request #304 from scottaiton/fix_option

Fix default run_directory option
ForestClaw · Jan 24, 2024 · d0049db · d0049db
2 parents b97fa86 + 2d4078e
commit d0049db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/fclaw2d_global.c b/src/fclaw2d_global.c
@@ -352,11 +352,11 @@ static char* old_path = NULL;
 void fclaw2d_set_global_context(fclaw2d_global_t *glob)
 {
     fclaw_options_t* opts = fclaw2d_get_options(glob);
-    fclaw_set_logging_prefix(opts->logging_prefix);
 
     // Change run directory
-    if(opts->run_directory != NULL){
+    if(strcmp(opts->run_directory,"") != 0){
         FCLAW_ASSERT(old_path == NULL);
+        fclaw_set_logging_prefix(opts->logging_prefix);
         old_path = fclaw_cwd();
         fclaw_cd(opts->run_directory);
     }

diff --git a/src/fclaw_options.c b/src/fclaw_options.c
@@ -55,7 +55,8 @@ fclaw_register (fclaw_options_t* fclaw_opt, sc_options_t * opt)
 {
     sc_options_add_string (opt, 0, "run-directory", 
                            &fclaw_opt->run_directory,
-                           NULL, "Directory for running simulation in, can be relative for absolute [cwd]");    
+                           "", "Directory for running simulation in, can be relative for absolute. "
+                               "Empty string means use current working directory []");    
 
     /* -------------------------- Time stepping control ------------------------------- */