Merge pull request #1551 from martin-frbg/f_check_fix

martin-frbg · web-flow · commit 7e3151ead782 · 2018-05-09T09:02:52.000+02:00
Fixes for ifort 2018
diff --git a/f_check b/f_check
@@ -97,7 +97,7 @@ if ($compiler eq "") {
 
 	if ($data =~ /Intel/) {
 	    $vendor = INTEL;
-	    $openmp = "-openmp";
+	    $openmp = "-fopenmp";
 	}
 
         if ($data =~ /Sun Fortran/) {
@@ -127,7 +127,7 @@ if ($compiler eq "") {
 
 	# for embeded underscore name, e.g. zho_ge, it may append 2 underscores.
 	$data = `$compiler -O2 -S ftest3.f > /dev/null 2>&1 && cat ftest3.s && rm -f ftest3.s`;
-	if ($data =~ /zho_ge__/) {
+	if ($data =~ / zho_ge__/) {
 	    $need2bu       = 1;
 	}
     }
@@ -155,7 +155,7 @@ if ($compiler eq "") {
 	if ($compiler =~ /ifort/) {
 	    $vendor = INTEL;
 	    $bu       = "_";
-	    $openmp = "-openmp";
+	    $openmp = "-fopenmp";
 	}
 
 	if ($compiler =~ /pathf/) {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ if ($compiler eq "") {`
`97`	`97`
`98`	`98`	`if ($data =~ /Intel/) {`
`99`	`99`	`$vendor = INTEL;`
`100`		`- $openmp = "-openmp";`
	`100`	`+ $openmp = "-fopenmp";`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`if ($data =~ /Sun Fortran/) {`
`@@ -127,7 +127,7 @@ if ($compiler eq "") {`
`127`	`127`
`128`	`128`	`# for embeded underscore name, e.g. zho_ge, it may append 2 underscores.`
`129`	`129`	$data = `$compiler -O2 -S ftest3.f > /dev/null 2>&1 && cat ftest3.s && rm -f ftest3.s`;
`130`		`- if ($data =~ /zho_ge__/) {`
	`130`	`+ if ($data =~ / zho_ge__/) {`
`131`	`131`	`$need2bu = 1;`
`132`	`132`	`}`
`133`	`133`	`}`
`@@ -155,7 +155,7 @@ if ($compiler eq "") {`
`155`	`155`	`if ($compiler =~ /ifort/) {`
`156`	`156`	`$vendor = INTEL;`
`157`	`157`	`$bu = "_";`
`158`		`- $openmp = "-openmp";`
	`158`	`+ $openmp = "-fopenmp";`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`if ($compiler =~ /pathf/) {`