Commit 17f5b18e authored by Lore, Jeremy's avatar Lore, Jeremy
Browse files

Update makefiles and matlab poincare plotting

parent a76f72c9

fortran/bfield_library_jdl/tests_updated/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ USE_M3DC1 = 1 # Set to 1 to compile with m3dc1 


SOURCEPATH = ./



HDF5_DIR = /usr/lib/x86_64-linux-gnu/hdf5/serial



# Location of bfield library 

LIBBJDL_DIR = $(HOME)/util-library/fortran/bfield_library_jdl/lib

# Location of bfield library include
@@ -37,7 +39,7 @@ INC = -I$(INCJDL_DIR) 
ifeq ($(strip $(USE_M3DC1)),1)

  DEFINES = -DHAVE_M3DC1

  LIBDIR_m3dc1 = -L$(FIO_INSTALL_DIR)/lib

  LIBS_m3dc1 = -lfusionio -lm3dc1_fortran -lm3dc1 -lstdc++ -lhdf5

  LIBS_m3dc1 = -lfusionio -lm3dc1_fortran -lm3dc1 -lstdc++ -L$(HDF5_DIR) -lhdf5

#  LIBS_m3dc1_full = libfusionio.a libm3dc1_fortran.a libm3dc1.a

  INCLUDE_m3dc1 = -I$(FIO_INSTALL_DIR)/include

endif

fortran/poincare/build/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ MODS90 = 
all: $(EXEC) #$(EXEC2)



$(EXEC): $(OBJS90) $(LIBBJDL_DIR)/libbjdl.a 

	mkdir -p $(BIN_DIR)

	@echo "Creating "$@" in directory "$(BIN_DIR)

	${FC} -o $@ $(FF) $^ $(LIBDIR) $(LIBS)

matlab/bfield_library_jdl/Poincare/plot_fortran_poincare.m

+83 −80
Original line number Diff line number Diff line
@@ -6,7 +6,10 @@ plot_glim = 0; 


fname_psimin = []; fname_psimin2 = []; gfile_name =[];





if 1

%    run_path = '/home/jjl/util-library/fortran/poincare/examples/M3DC1_14170'; suffix = 'test'; mytitle = 'test';

   run_path = '/home/jjl/util-library/fortran/poincare/examples/M3DC1_14170'; suffix = 'm3dc1_test'; mytitle = 'test';

end



if 0

    % 164723 <------------------------*********************--------------------
@@ -62,7 +65,7 @@ if 0 
    gfile_name = 'C:\Work\DIII-D\165274\kinetic\g165274.02120';

end



if 1

if 0

    %     run_path = 'C:\Work\fortran\test_poincare\W7-X\OP2\22kA\bmw\'; suffix = '60surf';mytitle = 'bmw';

    % run_path = 'C:\Work\fortran\test_poincare\W7-X\OP2\22kA\mfbe\'; suffix = '60surf';mytitle = 'mfbe';

    % run_path = 'C:\Work\fortran\test_poincare\W7-X\OP2\22kA\extender\'; suffix = '40surf_v2';mytitle = 'extender';

matlab/bfield_library_jdl/Poincare/read_poincare_file.m

+3 −2
Original line number Diff line number Diff line
@@ -8,9 +8,10 @@ for ifile = 1:2 
    else

        fname_tmp = fname2;

    end

    fid = fopen([run_path,fname_tmp]);

    thisName = fullfile(run_path,fname_tmp);

    fid = fopen(thisName);

    if fid == -1

        error('ERROR: cannot open %s\n',[run_path,fname_tmp])

        error('ERROR: cannot open %s\n',thisName)

    end

    dat = sscanf(fgets(fid),'%f %i %i',3);

    phi_plot_deg = dat(1);