Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small change to Ye(rho) #12

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Small change to Ye(rho) #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b29e7b3
M1 implicit timestepping fix from Evan
Oct 22, 2015
753e9b3
fixed problem with floating point precision in yeofrho
Sep 16, 2016
d96d4b7
merged with Evan
May 4, 2017
b9cbeb6
Merge branch 'master' of https://github.com/evanoconnor/GR1D
Sep 1, 2017
0b44583
enable linking to external NuLib without breaking anything for existi…
Sep 1, 2017
cc335b0
Merge branch 'master' of https://github.com/evanoconnor/GR1D
Sep 17, 2019
d85453e
format for stop statement allows compile
Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion make.inc.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ MODINC="-I ./"

HDF5DIR=
HDF5INCS=-I${HDF5DIR}/include
HDF5LIBS=-L${HDF5DIR}/lib -lhdf5 -lhdf5_fortran -lhdf5 -lz
HDF5LIBS=-L${HDF5DIR}/lib -lhdf5 -lhdf5_fortran -lhdf5 -lz -Wl,-rpath,${HDF5DIR}/lib

NULIBDIR=#use NuLib/src if linking to external NuLib library

LAPACKDIR=
LAPACKLIBS=-L${LAPACKDIR}/lib -llapack -lblas
Expand Down
13 changes: 8 additions & 5 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,12 @@ ifeq ($(HAVE_LEAK_ROS),1)
EXTRADEPS += leakage_rosswog/leakage_rosswog.a
endif

EXTRAINCS += -Inulibtable
EXTRAOBJECTS += nulibtable/nulibtable.a
EXTRADEPS += nulibtable/nulibtable.a
ifndef NULIBDIR
NULIBDIR=nulibtable
endif
EXTRAINCS += -I$(NULIBDIR)
EXTRAOBJECTS += $(NULIBDIR)/nulib.a
EXTRADEPS += $(NULIBDIR)/nulib.a

ifeq ($(HAVE_LAPACK),1)
EXTRAOBJECTS += $(LAPACKLIBS)
Expand All @@ -76,7 +79,7 @@ endif
GR1D: GR1D_module.o $(EXTRADEPS) $(OBJECTS)
$(F90) $(LDFLAGS) -o ../GR1D $(OBJECTS) $(EXTRAOBJECTS)

$(OBJECTS): %.o: %.F90
$(OBJECTS): %.o: %.F90
$(F90) $(F90FLAGS) $(DEFS) $(MODINC) $(EXTRAINCS) -c $< -o $@

GR1D.o: GR1D_module.o
Expand All @@ -87,7 +90,7 @@ nuc_eos/nuc_eos.a: nuc_eos/*.F90 nuc_eos/*.f
leakage_rosswog/leakage_rosswog.a: leakage_rosswog/leak_rosswog.F90
$(MAKE) -C leakage_rosswog

nulibtable/nulibtable.a: nulibtable/*.F90
nulibtable/nulib.a: nulibtable/*.F90
$(MAKE) -C nulibtable

clean:
Expand Down
2 changes: 1 addition & 1 deletion src/nuc_eos/linterp_many.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ SUBROUTINE intp3d_many ( x, y, z, f, kt, ft, nx, ny, nz, nvars, xt, yt, zt)
real*8 dx,dy,dz,dxi,dyi,dzi,dxyi,dxzi,dyzi,dxyzi
integer n,ix,iy,iz

IF (kt .GT. ktx) STOP'***KTX**'
IF (kt .GT. ktx) STOP '***KTX**'
!
!
!------ determine spacing parameters of (equidistant!!!) table
Expand Down
6 changes: 3 additions & 3 deletions src/nulibtable/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ NT_OBJECTS=$(NT_SOURCES:.F90=.o )
EXTRAINCS = $(HDF5INCS)
EXTRAOBJECTS = $(HDF5LIBS)

all: nulibtable.a
all: nulib.a

$(NT_OBJECTS): %.o: %.F90 $(EXTRADEPS)
$(F90) $(F90FLAGS) $(DEFS) $(MODINC) $(EXTRAINCS) -c $< -o $@

nulibtable.a: $(NT_OBJECTS)
ar r nulibtable.a *.o
nulib.a: $(NT_OBJECTS)
ar r nulib.a *.o

clean:
rm -rf *.o
Expand Down
4 changes: 2 additions & 2 deletions src/ye_of_rho.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ subroutine read_yeprofile
yeinlogrho(i) = yeinlogrho(i-1)
endif
do while ((j.lt.(plen+1)).and.proceed)
if (profilerho(j).gt.rhoinlogrho(i)) then
if (profilerho(j).ge.rhoinlogrho(i)) then
proceed = .false.
!set ye it interpolated value between next profile rho and last one
if (j.eq.1) then
Expand All @@ -160,7 +160,7 @@ subroutine read_yeprofile
j=j+1
enddo
if (j.eq.(plen+1).and.proceed) then
write(*,*) "Error",i
write(*,*) "Error",i, rhoinlogrho(i), profilerho(plen)
stop
endif
enddo
Expand Down