Compare commits
6 Commits
master
...
old-master
Author | SHA1 | Date | |
---|---|---|---|
f6ae2df8f0 | |||
42ca162ae3 | |||
74812da92a | |||
b151bf568b | |||
b7bec590d6 | |||
6627cb1481 |
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
.DS_Store
|
||||
*.o
|
||||
*.mod
|
12
Makefile
12
Makefile
@ -21,7 +21,17 @@ LDFLAGS= -static-libgfortran -static-libgcc
|
||||
LIBS= /usr/local/lib/libquadmath.a
|
||||
# FFLAGS=-Wall -g -finit-real=nan -ffpe-trap=invalid -fcheck=all -fbounds-check
|
||||
|
||||
DIRECTIVES = -DREVISION="'$(shell svnversion src)'"
|
||||
##
|
||||
## Git information (used in the version string)
|
||||
##
|
||||
|
||||
# Short hash of the latest commit
|
||||
GIT_REV ?= $(shell git rev-parse --short HEAD)
|
||||
|
||||
# Whether the worktree and the latest commit differs
|
||||
GIT_DIRTY ?= $(shell test -n "$$(git status --porcelain)" && echo "-dirty")
|
||||
|
||||
DIRECTIVES = -DREVISION=\"$(GIT_REV)$(GIT_DIRTY)\" -DPREFIX=\"$(PREFIX)\"
|
||||
|
||||
all: $(EXE)
|
||||
|
||||
|
@ -44,6 +44,7 @@ subroutine gray_jetto1beam(ijetto, mr, mz, r, z, psin, psia, rax, zax, &
|
||||
eqp%filenm='JETTO'
|
||||
eqp%iequil=ijetto+1
|
||||
prfp%filenm='JETTO'
|
||||
prfp%iprof=1
|
||||
outp%ipec=1
|
||||
firstcall=.false.
|
||||
outp%nrho=nrho
|
||||
|
18
src/main.f90
18
src/main.f90
@ -8,6 +8,8 @@ program main_std
|
||||
set_rhospl,setqphi_num,frhopolv
|
||||
use coreprofiles, only : read_profiles_an,read_profiles,tene_scal
|
||||
use reflections, only : range2rect
|
||||
use units, only : uprfin, uflx, ubres, ucnt, uprj0, uwbm, ucenr, uoutr, &
|
||||
udisp, upec, usumm, umaps
|
||||
implicit none
|
||||
type(antctrl_type) :: antp
|
||||
type(eqparam_type) :: eqp
|
||||
@ -127,6 +129,22 @@ program main_std
|
||||
print*,'Pabs (MW), Icd (kA) = ', pec,icd*1.0e3_wp_
|
||||
! ======= control prints END =======
|
||||
|
||||
! ======= flush open files BEGIN =======
|
||||
close(ucenr)
|
||||
close(usumm)
|
||||
close(uprj0)
|
||||
close(uprj0+1)
|
||||
close(uwbm)
|
||||
close(udisp)
|
||||
close(ubres)
|
||||
close(ucnt)
|
||||
close(umaps)
|
||||
close(uoutr)
|
||||
close(uprfin)
|
||||
close(uflx)
|
||||
close(upec)
|
||||
! ======= flush open files END =======
|
||||
|
||||
! ======= free memory BEGIN =======
|
||||
if(allocated(psrad)) deallocate(psrad)
|
||||
if(allocated(terad)) deallocate(terad, derad, zfc)
|
||||
|
Loading…
Reference in New Issue
Block a user