build on engaging centos7, fieldline tracing for mirror

ORNL-Fusion · Feb 8, 2024 · 53cf57c · 53cf57c
1 parent d67b22a
commit 53cf57c
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 119 deletions.
diff --git a/compileropts.gnu b/compileropts.gnu
@@ -1,14 +1,14 @@
 # gfortran options
 
 
-GF_VER=`gfortran  -dumpversion`
+GF_VER=$(shell eval gfortran  -dumpversion)
 
 ifeq ($(GF_VER), "6.2.0")
  C13_ARGS=""
  $(info $(GF_VER) )
 else
  $(info $(GF_VER) )
- C13_ARGS=-fallow-argument-mismatch
+ C13_ARGS= -fallow-argument-mismatch
 endif
 
 COMMON_OPTION  = -fno-automatic -fdefault-real-8 -fdefault-double-8 

diff --git a/makeopts.eofe7 b/makeopts.eofe7
@@ -1,6 +1,6 @@
 include compileropts.gnu
 #CENTOS7 systems at mit engaging cluster
-FC = mpif90 -cpp
+FC = mpif90 -g -cpp
 NETCDF_LIB=/home/software/gcc/6.2.0/pkg/netcdf/4.6.3-c/lib
 NETCDF_INC=/home/software/gcc/6.2.0/pkg/netcdf/4.6.3-c/include
 SCALAPACK_LIB=/nfs/psfclab001/software/spack/var/spack/environments/scalapack/.spack-env/view/lib

diff --git a/modules.eofe7 b/modules.eofe7
@@ -1,4 +1,4 @@
-module use /orcd/nese/psfc/001/software/modulefiles/psfc-modules
+module use /nfs/psfclab001/software/modulefiles/
 module load gcc
 module load openmpi/3.0.4
 module load psfc/pgplot/gcc6.2.0/5.2.2 netcdf/4.6.3

diff --git a/src/aorsa2din_mod.f90 b/src/aorsa2din_mod.f90
@@ -274,6 +274,7 @@ module aorsa2din_mod
       integer :: i_antenna = 1            ! i_antenna = flag determining which antenna model is used
                                           ! if(i_antenna .eq. 0) antenna current is Gaussian 
                                           ! if(i_antenna .eq. 1) antenna current is cos(ky * y)  (default)
+                                          ! 2,3,4 ranval for y,x,z components
                                           ! where ky = omgrf / vphase = (omgrf / clight) * antlc = k0 * antlc
                                           ! For constant current, set antlc = 0.0
       integer :: nuper = 65

diff --git a/src/field_line_trace.f b/src/field_line_trace.f
@@ -161,7 +161,7 @@ subroutine field_line_trace(myid, eqdsk, nmodesx, nmodesy,
       real zbratio(nxmx, nymx, 3)
       real zpsi(nxmx, nymx, 3)
 
-        real temp(2 *(nxmx + nymx) )
+      real temp(2 *(nxmx + nymx) )
       real surf2, curv2
 
 
@@ -2830,7 +2830,7 @@ subroutine eqdsk_setup2(myid, eqdsk, nmodesx, nmodesy,
       real zbratio(nxmx, nymx, 3)
       real zpsi(nxmx, nymx, 3)
 
-        real temp(2 *(nxmx + nymx) )
+      real temp(2 *(nxmx + nymx) )
       real surf2, curv2