diff --git a/Makefile b/Makefile index 96e973b..1fdf3b0 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ bin = ./bin/ ldir = $(src)lib/ pdir = $(src)parser/ +mdl = $(src)model/ # DEFINE THE PATH @@ -29,11 +30,12 @@ pdir = $(src)parser/ VPATH = $(src) VPATH += $(ldir) VPATH += $(pdir) +VPATH += $(mdl) # extra dir extra_dirs = logs nnfits scans -gincl = -I$(src) -I$(pdir) -I$(ldir) +gincl = -I$(src) -I$(pdir) -I$(ldir) -I$(mdl) # GFORTRAN COMPILER FC := gfortran @@ -98,10 +100,8 @@ genann_objects = geNNetic.o iNNterface.o puNNch.o \ # Objects depending on model #mod_objects = nnmodel.o nncoords.o -pln_objects = invariants_no3.o nncoords_no3.o genetic_param_no3.o model_no3.o nnadia_no3.o -#pyr_objects = invariants_nh3.o nncoords_nh3.o fit_genetic_Umb.o model_dipole_nh3.o dip_nh3plus_model.o -#mod_objects = invariants_nh3.o nncoords_nh3.o fit_genetic.o \ - new_model_dipole.o dip_nh3plus_model.o +pln_objects = invariants_no3.o nncoords_no3.o genetic_param_nh3_planar.o model_nh3.o nnadia_nh3.o + # Objects belonging to internal library lib_objects = misc.o ran_gv.o choldc.o diag.o \