@@ -65,11 +65,13 @@ To see the full documentation type: ``@? grd2cpt``
6565"""
6666grd2cpt (cmd0:: String ; kwargs... ) = grd2cpt_helper (cmd0, nothing ; kwargs... )
6767grd2cpt (arg1; kwargs... ) = grd2cpt_helper (" " , arg1; kwargs... )
68+ function grd2cpt_helper (cmd0:: String , arg1; kwargs... )
69+ d = init_module (false , kwargs... )[1 ] # Also checks if the user wants ONLY the HELP mode
70+ grd2cpt_helper (cmd0, arg1, d)
71+ end
6872
6973# ---------------------------------------------------------------------------------------------------
70- function grd2cpt_helper (cmd0:: String , arg1; kw... )
71-
72- d = init_module (false , kw... )[1 ] # Also checks if the user wants ONLY the HELP mode
74+ function grd2cpt_helper (cmd0:: String , arg1, d:: Dict{Symbol, Any} )
7375
7476 cmd, = parse_common_opts (d, " " , [:R :V_params :b :h :t ])
7577 cmd, Tvec = helper_cpt (d, cmd)
@@ -80,7 +82,7 @@ function grd2cpt_helper(cmd0::String, arg1; kw...)
8082
8183 cmd, got_fname, arg1 = find_data (d, cmd0, cmd, arg1)
8284 N_used = got_fname == 0 ? 1 : 0 # To know whether a cpt will go to arg1 or arg2
83- isa (arg1, GMTgrid) && ((val = find_in_kwargs (kw , CPTaliases)[ 1 ] ) === nothing ) && (d[:C ] = (arg1. cpt != " " ) ? arg1. cpt : :turbo )
85+ isa (arg1, GMTgrid) && ((val = is_in_dict (d , CPTaliases)) === nothing ) && (d[:C ] = (arg1. cpt != " " ) ? arg1. cpt : :turbo )
8486 cmd, arg1, arg2, = add_opt_cpt (d, cmd, CPTaliases, ' C' , N_used, arg1)
8587
8688 r = common_grd (d, " grd2cpt " * cmd, arg1, arg2) # r may be a tuple if -E+f was used
0 commit comments