Finished intel. Bounds check in rf2x_setup2.f, fixed float comparisons

ORNL-Fusion · May 18, 2024 · 92f37e0 · 92f37e0
1 parent 1eac800
commit 92f37e0
Show file tree

Hide file tree

Showing 9 changed files with 156 additions and 241 deletions.
diff --git a/makefile b/makefile
@@ -12,10 +12,10 @@ OBJ_DIR = obj
 INCLUDE_DIRS = 
 LIBS = 
 F90FLAGS = 
-WARNING_FLAGS = 
+WARNING_FLAGS =  -check all
 
 # per file build warning flags
-ORBIT_F_WARNING_FLAGS = 
+ORBIT_F_WARNING_FLAGS =
 
 OBJ_FILES = \
  $(OBJ_DIR)/cauchy_mod.o \
@@ -148,7 +148,13 @@ ifeq ($(LSB_IS),Ubuntu)
   endif
 endif
 ifeq ($(SLURM_CLUSTER_NAME),eofe7) #building on node
-  include makeopts.eofe7   #.intel
+  ifdef MKLROOT
+  include makeopts.eofe7.intel
+  $(info "Intel found" )
+  else
+  include makeopts.eofe7
+  $(info "gcc assumed" )
+  endif
   SYSTEM_IDENTIFIED = 1
 endif
 ifeq ($(HOSTNAME),eofe7.mit.edu)  #building on host
@@ -201,8 +207,8 @@ ${OBJ_DIR}/%.o: ${SRC_DIR}/%.F90
 ${OBJ_DIR}/%.o: ${SRC_DIR}/%.F
 	${COMPILE90} -c $< -o $@ ${INCLUDE_DIRS} ${WARNING_FLAGS}
 
-${OBJ_DIR}/orbit.o: ${SRC_DIR}/orbit.f
-	${COMPILE90} -c $< -o $@ ${INCLUDE_DIRS} ${SIGMA_F_WARNING_FLAGS}
+#${OBJ_DIR}/orbit.o: ${SRC_DIR}/orbit.f
+#	${COMPILE90} -c $< -o $@ ${INCLUDE_DIRS} ${ORBIT_F_WARNING_FLAGS}
 
 
 $(OBJ_DIR)/rf2x_setup2.o:    $(SRC_DIR)/rf2x_setup2.f 
@@ -219,7 +225,7 @@ $(OBJ_DIR)/eqdsk_setup.o:    $(SRC_DIR)/eqdsk_setup.f
 
 $(OBJ_DIR)/orbit.o:          $(SRC_DIR)/orbit.f
 	                     $(COMPILE90_NOSAVE) -o $(OBJ_DIR)/orbit.o \
-                             $(SRC_DIR)/orbit.f $(INCLUDE_DIRS)			     
+                             $(SRC_DIR)/orbit.f  ${ORBIT_F_WARNING_FLAGS}$(INCLUDE_DIRS)
 
 $(OBJ_DIR)/eqdsk_plot.o:     $(SRC_DIR)/eqdsk_plot.f90
 	                     $(COMPILE_r4) -o $(OBJ_DIR)/eqdsk_plot.o \

diff --git a/makeopts.eofe7.intel b/makeopts.eofe7.intel
@@ -0,0 +1,6 @@
+include compileropts.intel
+#-ftrapuv #there are a LOT of unitialized vars in aorsa
+FC = mpiifort -cpp -g -O0 -traceback  -debug all -mkl=cluster -module mod
+LIBS = -L$(PGPLOT_DIR) -lpgplot -L$(NETCDF_LIB) -L$(NETCDFF_LIB)  -lnetcdff  -lnetcdf
+LIBS +=  -L /usr/lib64 -lX11
+INCLUDE_DIRS = -I$(NETCDF_INC)  -I$(NETCDFF_INC)
diff --git a/modules.eofe7 b/modules.eofe7
@@ -4,3 +4,12 @@ module load openmpi/3.0.4
 module load psfc/pgplot/gcc6.2.0/5.2.2 netcdf/4.6.3
 module load psfc/totalview
 #scalapack with rpath
+
+
+#[jcwright@node074 aorsa]$ module list
+#Currently Loaded Modulefiles:
+module use /home/software/psfc/modulefiles/
+module load intel/2020-04
+module load impi/2020-04
+module load psfc/netcdf/intel-17/4.4.1.1
+module load psfc/pgplot/gcc6.2.0/5.2.2