Merge pull request #21 from jinyun1tang/jytang/bmark

bug fix for gcc14 compilers
jinyun1tang · Oct 11, 2024 · 98bda3a · 98bda3a
2 parents 13117fe + 67d8d4a
commit 98bda3a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/examples/blodgett/ENF_g b/examples/blodgett/ENF_g
@@ -5,7 +5,7 @@
 30040000 0 0 1000 0.00083 1 1 1 0 0 0 0 0
 31050000 0 0 1000 0.00083 1 1 1 0 0 0 0 0
 30060000 0 0 1000 0.00083 1 1 1 0 0 0 0 0
-31170000 0 0 1000 0.00083 1 1 1 0 0 0 0 0
+31070000 0 0 1000 0.00083 1 1 1 0 0 0 0 0
 31080000 0 0 1000 0.00083 1 1 1 0 0 0 0 0
 30090000 0 0 1000 0.00083 1 1 1 0 0 0 0 0
 31100000 0 0 1000 0.00083 1 1 1 0 0 0 0 0

diff --git a/f77src/ecosys_core/CMakeLists.txt b/f77src/ecosys_core/CMakeLists.txt
@@ -53,7 +53,7 @@ configure_file(filec.h  filec.h COPYONLY)
 configure_file(files.h  files.h COPYONLY)
 configure_file(parameters.h parameters.h COPYONLY)
 set(ECOSYS_SOURCES 
-	BLOCKDATA001.f
+#	BLOCKDATA001.f
 	day.f
 	endrun.f
 	erosion.f

diff --git a/f77src/ecosys_driver/main.f b/f77src/ecosys_driver/main.f
@@ -7,13 +7,17 @@ PROGRAM main
       include "filec.h"
       include "files.h"
       include "blkc.h"
+      include "blk17.h"      
+
       DIMENSION NA(250),ND(250)
       CHARACTER*16 DATA(30),DATAC(30,250,250),DATAP(JP,JY,JX)
      2,DATAM(JP,JY,JX),DATAX(JP),DATAY(JP),DATAZ(JP,JY,JX)
      3,OUTS(10),OUTP(10),OUTFILS(10,JY,JX),OUTFILP(10,JP,JY,JX)
       CHARACTER*3 CHOICE(102,20)
       CHARACTER*8 CDATE
       CHARACTER*80 BUF,PREFIX
+
+      ICOR=(/1,-1,0,0,1,1,2,3,3,4,4,5/)
       CALL GETCWD(BUF)
 C
 C     IDENTIFY OPERATING SYSTEM: DOS OR UNIX