stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pac: Changed logic of the tests on growth and steady_state_growth options.

issue#70
Stéphane Adjemian (Charybdis) 2019-02-25 16:19:59 +01:00
parent 64f55e4a5e
commit abde60fbea
Signed by untrusted user who does not match committer: stepan
GPG Key ID: A6D44CB9C64CE77B
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ParsingDriver.cc
View File

@ -2627,12 +2627,12 @@ ParsingDriver::pac_model()
else
aux_model_name = it->second;
else
if (pac_steady_state_growth_rate_number < 0 && pac_steady_state_growth_rate_symb_id < 0)
error("when aux_model_name is not passed to the pac_model statement, you must pass steady_state_growth option");
else if (pac_growth_symb_id >= 0 && mod_file->symbol_table.getType(pac_growth_symb_id) == SymbolType::parameter
&& (pac_steady_state_growth_rate_number >= 0
|| pac_steady_state_growth_rate_symb_id != pac_growth_symb_id))
error("when aux_model_name is not passed to the pac_model statement, steady_state_growth must be a parameter equal to growth");
if (pac_growth_symb_id >= 0 && mod_file->symbol_table.getType(pac_growth_symb_id) == SymbolType::parameter
&& (pac_steady_state_growth_rate_number >= 0 || pac_steady_state_growth_rate_symb_id >=0))
warning("If growth option is constant, steady_state_growth is ignored");
else if (pac_growth_symb_id >= 0 && mod_file->symbol_table.getType(pac_growth_symb_id) != SymbolType::parameter
&& (pac_steady_state_growth_rate_number < 0 || pac_steady_state_growth_rate_symb_id < 0))
error("The steady state growth rate of the target must be provided (steady_state_growth option) if option growth is not constant");
if (pac_steady_state_growth_rate_symb_id >= 0
&& mod_file->symbol_table.getType(pac_steady_state_growth_rate_symb_id) != SymbolType::parameter)