Commit d6d51c6e authored by Natalja Rakowsky's avatar Natalja Rakowsky
Browse files

Bug fix: command line was ignored

parent 9e089480
......@@ -317,7 +317,6 @@ CONTAINS
if (cli_eq_params) then
if (.not. have_cli_tsid) call derive_TSID
enable_idealised = .true.
endif
endif
......@@ -655,21 +654,23 @@ CONTAINS
! NAMELIST /model_init/
OPEN(newunit=infile_nml, file = 'namelist.tsunami', iostat=stat)
READ(infile_nml, NML = model_init, iostat=stat)
CLOSE(infile_nml)
if (cli_eq_params) then
! /model_init/ is mutually exclusive with specifying parameters via command line or QuakeML
if (stat==0) then
print *,"/model_init/ This part will be ignored, as EQ parameters are specified on the command line."
endif
enable_idealised = .true.
elseif (cli_quakeml) then
if (stat==0) then
print *,"/model_init/ This part will be ignored, as EQ parameters are specified in QuakeML file"
endif
else
OPEN(newunit=infile_nml, file = 'namelist.tsunami', iostat=stat)
READ(infile_nml, NML = model_init, iostat=stat)
CLOSE(infile_nml)
if (.not. (enable_ruptgen_scenario .or. enable_okada_scenario .or. enable_read_initial_field .or. &
enable_benchmark .or. enable_idealised .or. enable_aifdr_scenario)) then
print *,'/model_init/No scenario type given. We take: enable_benchmark=.true., benchmark_ident=1'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment