Commits

Daniel Reynolds  committed 27e5dea

Forgot to disable fortran compiler redefinition of real and integer; this uncovered one more bug in a fortran file. Now everything seems fine.

  • Participants
  • Parent commits 9d871a2

Comments (0)

Files changed (2)

File src/enzo/Make.config.assemble

     ifeq ($(CONFIG_INTEGERS),32)
         ERROR_INTEGERS = 0
         ASSEMBLE_INTEGER_DEFINES = -DSMALL_INTS
-        ASSEMBLE_INTEGER_FFLAGS = $(MACH_FFLAGS_INTEGER_32)
+        ASSEMBLE_INTEGER_FFLAGS = #$(MACH_FFLAGS_INTEGER_32)
     endif
 
     # Settings for 64-bit integers
     ifeq ($(CONFIG_INTEGERS),64)
         ERROR_INTEGERS = 0
         ASSEMBLE_INTEGER_DEFINES = -DLARGE_INTS
-        ASSEMBLE_INTEGER_FFLAGS = $(MACH_FFLAGS_INTEGER_64)
+        ASSEMBLE_INTEGER_FFLAGS = #$(MACH_FFLAGS_INTEGER_64)
     endif
 
     # error if CONFIG_INTEGERS is incorrect
     ifeq ($(CONFIG_PRECISION),32)
         ERROR_PRECISION = 0
         ASSEMBLE_PRECISION_DEFINES = -DCONFIG_BFLOAT_4
-        ASSEMBLE_PRECISION_FFLAGS = $(MACH_FFLAGS_REAL_32)
+        ASSEMBLE_PRECISION_FFLAGS = #$(MACH_FFLAGS_REAL_32)
         ASSEMBLE_PRECISION_NUMBER = 4
     endif
 
     ifeq ($(CONFIG_PRECISION),64)
         ERROR_PRECISION = 0
         ASSEMBLE_PRECISION_DEFINES = -DCONFIG_BFLOAT_8
-        ASSEMBLE_PRECISION_FFLAGS = $(MACH_FFLAGS_REAL_64)
+        ASSEMBLE_PRECISION_FFLAGS = #$(MACH_FFLAGS_REAL_64)
         ASSEMBLE_PRECISION_NUMBER = 8
     endif
 

File src/enzo/feedback_formulae.F

 c     
 c     cumulative mass loss due to PN
 c
-          x = alog10(age)
+          x = log10(age)
           if ( x .le. 7.5_RKIND) then
              mlossPN = 0._RKIND
           else if ( x .le. 9.2_RKIND) then