Skip to content

Commit 2f320ee

Browse files
andrew-plattandrew-platt
authored
Merge pull request #2601 from andrew-platt/b/IntelOMP
[BugFix] OMP critical names preventing Intel+OMP compilation
2 parents da685d4 + 51f00d7 commit 2f320ee

File tree

19 files changed

+108
-108
lines changed

19 files changed

+108
-108
lines changed

‎modules/aerodyn/src/AeroDyn_IO.f90

+4-4
Original file line numberDiff line numberDiff line change
@@ -1446,10 +1446,10 @@ SUBROUTINE ReadBladeInputs ( ADBlFile, BladeKInputFileData, AeroProjMod, UnEc, c
14461446
UnIn = -1
14471447

14481448
! Open the input file for blade K.
1449-
!$OMP critical(filename)
1449+
!$OMP critical(fileopen_critical)
14501450
CALL GetNewUnit( UnIn, ErrStat2, ErrMsg2 )
14511451
CALL OpenFInpFile ( UnIn, ADBlFile, ErrStat2, ErrMsg2 )
1452-
!$OMP end critical(filename)
1452+
!$OMP end critical(fileopen_critical)
14531453
CALL SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
14541454
IF ( ErrStat >= AbortErrLev ) RETURN
14551455

@@ -1752,10 +1752,10 @@ SUBROUTINE AD_PrintSum( InputFileData, p, p_AD, u, y, NumBlades, BladeInputFileD
17521752

17531753
! Open the summary file and give it a heading.
17541754

1755-
!$OMP critical(filename)
1755+
!$OMP critical(fileopen_critical)
17561756
CALL GetNewUnit( UnSu, ErrStat, ErrMsg )
17571757
CALL OpenFOutFile ( UnSu, TRIM( p%RootName )//'.sum', ErrStat, ErrMsg )
1758-
!$OMP end critical(filename)
1758+
!$OMP end critical(fileopen_critical)
17591759
IF ( ErrStat >= AbortErrLev ) RETURN
17601760

17611761
! Heading:

‎modules/aerodyn/src/AirfoilInfo.f90

+4-4
Original file line numberDiff line numberDiff line change
@@ -1932,12 +1932,12 @@ subroutine AFI_WrHeader(delim, FileName, unOutFile, ErrStat, ErrMsg)
19321932
ChanName(i) = 'alphaBreakLower'; ChanUnit(i) = '(deg)'; i = i+1;
19331933
ChanName(i) = 'CnBreakLower'; ChanUnit(i) = '(-)'; i = i+1;
19341934

1935-
!$OMP critical(filename)
1935+
!$OMP critical(fileopen_critical)
19361936
CALL GetNewUnit( unOutFile, ErrStat, ErrMsg )
19371937
if (ErrStat < AbortErrLev) then
19381938
CALL OpenFOutFile ( unOutFile, trim(FileName), ErrStat2, ErrMsg2 )
19391939
endif
1940-
!$OMP end critical(filename)
1940+
!$OMP end critical(fileopen_critical)
19411941

19421942
! Generate file outputs
19431943

@@ -2110,12 +2110,12 @@ subroutine AFI_WrTables(AFI_Params,UAMod,OutRootName)
21102110

21112111

21122112
! Write to file
2113-
!$OMP critical(filename)
2113+
!$OMP critical(fileopen_critical)
21142114
CALL GetNewUnit( unOutFile, ErrStat, ErrMsg )
21152115
if (ErrStat < AbortErrLev) then
21162116
CALL OpenFOutFile ( unOutFile, trim(OutRootName)//'.Coefs.'//trim(num2lstr(iTab))//'.out', ErrStat, ErrMsg )
21172117
endif
2118-
!$OMP end critical(filename)
2118+
!$OMP end critical(fileopen_critical)
21192119
if (ErrStat >= AbortErrLev) then
21202120
call WrScr(Trim(ErrMsg))
21212121
return

‎modules/aerodyn/src/UnsteadyAero.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -1438,12 +1438,12 @@ subroutine UA_Init_Outputs(InitInp, p, y, InitOut, errStat, errMsg)
14381438
! --- Write to File
14391439
if ((p%NumOuts > 0) .and. p%UA_OUTS==2) then
14401440
call WrScr(' UA: Writing separate output file: '//trim(InitInp%OutRootName)//'.out')
1441-
!$OMP critical(filename)
1441+
!$OMP critical(fileopen_critical)
14421442
CALL GetNewUnit( p%unOutFile, ErrStat2, ErrMsg2 )
14431443
if (ErrStat2 < AbortErrLev) then
14441444
CALL OpenFOutFile ( p%unOutFile, trim(InitInp%OutRootName)//'.UA.out', ErrStat2, ErrMsg2 )
14451445
endif
1446-
!$OMP end critical(filename)
1446+
!$OMP end critical(fileopen_critical)
14471447
call SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
14481448
if (ErrStat >= AbortErrLev) return
14491449

‎modules/awae/src/AWAE_IO.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -505,10 +505,10 @@ SUBROUTINE AWAE_PrintSum( p, u, y, ErrStat, ErrMsg )
505505

506506
! Open the summary file and give it a heading.
507507

508-
!$OMP critical(fileopen)
508+
!$OMP critical(fileopen_critical)
509509
CALL GetNewUnit( UnSu, ErrStat, ErrMsg )
510510
CALL OpenFOutFile ( UnSu, TRIM( p%OutFileRoot )//'.sum', ErrStat, ErrMsg )
511-
!$OMP end critical(fileopen)
511+
!$OMP end critical(fileopen_critical)
512512
IF ( ErrStat >= AbortErrLev ) RETURN
513513

514514

‎modules/beamdyn/src/BeamDyn_IO.f90

+6-6
Original file line numberDiff line numberDiff line change
@@ -588,11 +588,11 @@ SUBROUTINE BD_ReadPrimaryFile(InputFile,InputFileData,OutFileRoot,UnEc,ErrStat,E
588588
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
589589

590590

591-
!$OMP critical(filename)
591+
!$OMP critical(fileopen_critical)
592592
CALL GetNewUnit(UnIn,ErrStat2,ErrMsg2)
593593
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
594594
CALL OpenFInpFile(UnIn,InputFile,ErrStat2,ErrMsg2)
595-
!$OMP end critical(filename)
595+
!$OMP end critical(fileopen_critical)
596596
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
597597
IF (ErrStat >= AbortErrLev) then
598598
call cleanup()
@@ -1052,11 +1052,11 @@ SUBROUTINE BD_ReadBladeFile(BldFile,BladeInputFileData,UnEc,ErrStat,ErrMsg)
10521052
ErrStat = ErrID_None
10531053
ErrMsg = ""
10541054

1055-
!$OMP critical(filename)
1055+
!$OMP critical(fileopen_critical)
10561056
CALL GetNewUnit(UnIn,ErrStat2,ErrMsg2)
10571057
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
10581058
CALL OpenFInpFile (UnIn,BldFile,ErrStat2,ErrMsg2)
1059-
!$OMP end critical(filename)
1059+
!$OMP end critical(fileopen_critical)
10601060
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
10611061
if (ErrStat >= AbortErrLev) then
10621062
return
@@ -1946,10 +1946,10 @@ SUBROUTINE BD_PrintSum( p, x, OtherState, m, InitInp, ErrStat, ErrMsg )
19461946

19471947
! Open the summary file and give it a heading.
19481948

1949-
!$OMP critical(filename)
1949+
!$OMP critical(fileopen_critical)
19501950
CALL GetNewUnit( UnSu, ErrStat, ErrMsg )
19511951
CALL OpenFOutFile ( UnSu, TRIM( InitInp%RootName )//'.sum.yaml', ErrStat, ErrMsg )
1952-
!$OMP end critical(filename)
1952+
!$OMP end critical(fileopen_critical)
19531953
IF ( ErrStat >= AbortErrLev ) RETURN
19541954

19551955
! Heading:

‎modules/elastodyn/src/ElastoDyn.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -9759,12 +9759,12 @@ SUBROUTINE ED_PrintSum( p, OtherState, ErrStat, ErrMsg )
97599759

97609760
! Open the summary file and give it a heading.
97619761

9762-
!$OMP critical(filename)
9762+
!$OMP critical(fileopen_critical)
97639763
CALL GetNewUnit( UnSu, ErrStat, ErrMsg )
97649764
if (ErrStat < AbortErrLev) then
97659765
CALL OpenFOutFile ( UnSu, TRIM( p%RootName )//'.sum', ErrStat, ErrMsg )
97669766
endif
9767-
!$OMP end critical(filename)
9767+
!$OMP end critical(fileopen_critical)
97689768
IF ( ErrStat /= ErrID_None ) RETURN
97699769

97709770

‎modules/elastodyn/src/ElastoDyn_IO.f90

+4-4
Original file line numberDiff line numberDiff line change
@@ -2064,13 +2064,13 @@ SUBROUTINE ReadTowerFile( TwrFile, InputFileData, UnEc, ErrStat, ErrMsg )
20642064
ErrMsg = ""
20652065

20662066

2067-
!$OMP critical(filename)
2067+
!$OMP critical(fileopen_critical)
20682068
CALL GetNewUnit( UnIn, ErrStat, ErrMsg )
20692069
IF ( ErrStat < AbortErrLev ) THEN
20702070
! Open the tower input file.
20712071
CALL OpenFInpFile ( UnIn, TwrFile, ErrStat2, ErrMsg2 )
20722072
ENDIF
2073-
!$OMP end critical(filename)
2073+
!$OMP end critical(fileopen_critical)
20742074
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
20752075
IF ( ErrStat >= AbortErrLev ) THEN
20762076
CALL Cleanup()
@@ -2407,13 +2407,13 @@ SUBROUTINE ReadPrimaryFile( InputFile, InputFileData, BldFile, FurlFile, TwrFile
24072407

24082408

24092409
! Get an available unit number for the file.
2410-
!$OMP critical(filename)
2410+
!$OMP critical(fileopen_critical)
24112411
CALL GetNewUnit( UnIn, ErrStat, ErrMsg )
24122412
IF ( ErrStat < AbortErrLev ) THEN
24132413
! Open the Primary input file.
24142414
CALL OpenFInpFile ( UnIn, InputFile, ErrStat2, ErrMsg2 )
24152415
ENDIF
2416-
!$OMP end critical(filename)
2416+
!$OMP end critical(fileopen_critical)
24172417
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
24182418
IF ( ErrStat >= AbortErrLev ) THEN
24192419
CALL Cleanup()

‎modules/hydrodyn/src/HydroDyn_Output.f90

+4-4
Original file line numberDiff line numberDiff line change
@@ -797,10 +797,10 @@ SUBROUTINE HDOut_OpenSum( UnSum, SummaryName, HD_Prog, ErrStat, ErrMsg )
797797
ErrStat = ErrID_None
798798
ErrMsg = ""
799799

800-
!$OMP critical(fileopen)
800+
!$OMP critical(fileopen_critical)
801801
CALL GetNewUnit( UnSum )
802802
CALL OpenFOutFile ( UnSum, SummaryName, ErrStat, ErrMsg )
803-
!$OMP end critical(fileopen)
803+
!$OMP end critical(fileopen_critical)
804804
IF (ErrStat >=AbortErrLev) RETURN
805805

806806

@@ -1124,10 +1124,10 @@ SUBROUTINE HDOut_OpenOutput( HydroDyn_ProgDesc, OutRootName, p, InitOut, ErrSta
11241124
! Open the file for output
11251125
OutFileName = TRIM(OutRootName)//'.out'
11261126

1127-
!$OMP critical(fileopen)
1127+
!$OMP critical(fileopen_critical)
11281128
CALL GetNewUnit( p%UnOutFile )
11291129
CALL OpenFOutFile ( p%UnOutFile, OutFileName, ErrStat, ErrMsg )
1130-
!$OMP end critical(fileopen)
1130+
!$OMP end critical(fileopen_critical)
11311131
IF (ErrStat >=AbortErrLev) RETURN
11321132

11331133

‎modules/hydrodyn/src/WAMIT2.f90

+4-4
Original file line numberDiff line numberDiff line change
@@ -3106,13 +3106,13 @@ SUBROUTINE Read_DataFile3D( InitInp, Filename3D, Data3D, ErrStat, Errmsg )
31063106
!------------------------------------------------------------------------------
31073107

31083108
! Find a unit number to use
3109-
!$OMP critical(fileopen)
3109+
!$OMP critical(fileopen_critical)
31103110
CALL GetNewUnit(UnitDataFile,ErrStatTmp,ErrMsgTmp)
31113111
if (ErrStatTmp < AbortErrLev) then
31123112
! Open the file
31133113
CALL OpenFInpFile( UnitDataFile, TRIM(Filename3D), ErrStat, ErrMsg ) ! Open file containing mean drift information
31143114
endif
3115-
!$OMP end critical(fileopen)
3115+
!$OMP end critical(fileopen_critical)
31163116
CALL SetErrStat( ErrStatTmp, ErrMsgTmp, ErrStat, ErrMsg, RoutineName)
31173117
IF ( ErrStat >= AbortErrLev ) THEN
31183118
UnitDataFile = -1
@@ -3777,13 +3777,13 @@ SUBROUTINE Read_DataFile4D( InitInp, Filename4D, Data4D, ErrStat, Errmsg )
37773777
!------------------------------------------------------------------------------
37783778

37793779
! Find a unit number to use
3780-
!$OMP critical(fileopen)
3780+
!$OMP critical(fileopen_critical)
37813781
CALL GetNewUnit(UnitDataFile,ErrStatTmp,ErrMsgTmp)
37823782
if (ErrStatTmp < AbortErrLev) then
37833783
! Open the file
37843784
CALL OpenFInpFile( UnitDataFile, TRIM(Filename4D), ErrStatTmp, ErrMsgTmp ) ! Open file containing mean drift information
37853785
endif
3786-
!$OMP end critical(fileopen)
3786+
!$OMP end critical(fileopen_critical)
37873787
CALL SetErrStat( ErrStatTmp, ErrMsgTmp, ErrStat, ErrMsg, RoutineName)
37883788
IF ( ErrStat >= AbortErrLev ) THEN
37893789
CLOSE( UnitDataFile )

‎modules/inflowwind/src/InflowWind_IO.f90

+6-6
Original file line numberDiff line numberDiff line change
@@ -534,13 +534,13 @@ subroutine IfW_TurbSim_Init(InitInp, SumFileUnit, G3D, FileDat, ErrStat, ErrMsg)
534534
!----------------------------------------------------------------------------
535535

536536
! Get a unit number to use for the wind file
537-
!$OMP critical(fileopen)
537+
!$OMP critical(fileopen_critical)
538538
call GetNewUnit(WindFileUnit, TmpErrStat, TmpErrMsg)
539539
if (TmpErrStat < AbortErrLev) then
540540
! Open binary file
541541
call OpenBInpFile(WindFileUnit, TRIM(InitInp%WindFileName), TmpErrStat, TmpErrMsg)
542542
endif
543-
!$OMP end critical(fileopen)
543+
!$OMP end critical(fileopen_critical)
544544
call SetErrStat(TmpErrStat, TmpErrMsg, ErrStat, ErrMsg, RoutineName)
545545
if (ErrStat >= AbortErrLev) return
546546

@@ -904,13 +904,13 @@ subroutine IfW_HAWC_Init(InitInp, SumFileUnit, G3D, FileDat, ErrStat, ErrMsg)
904904
do IC = 1, G3D%NComp
905905

906906
! Get a unit number to use for the wind file
907-
!$OMP critical(fileopen)
907+
!$OMP critical(fileopen_critical)
908908
call GetNewUnit(WindFileUnit, TmpErrStat, TmpErrMsg)
909909
if (TmpErrStat < AbortErrLev) then
910910
! Open wind file for this component
911911
call OpenBInpFile(WindFileUnit, InitInp%WindFileName(IC), TmpErrStat, TmpErrMsg)
912912
endif
913-
!$OMP end critical(fileopen)
913+
!$OMP end critical(fileopen_critical)
914914
call SetErrStat(TmpErrStat, TmpErrMsg, ErrStat, ErrMsg, RoutineName)
915915
if (ErrStat >= AbortErrLev) return
916916

@@ -1140,7 +1140,7 @@ subroutine IfW_Bladed_Init(InitInp, SumFileUnit, InitOut, G3D, FileDat, ErrStat,
11401140
end if
11411141

11421142
! Get a unit number to use
1143-
!$OMP critical(fileopen)
1143+
!$OMP critical(fileopen_critical)
11441144
call GetNewUnit(UnitWind, TmpErrStat, TmpErrMsg)
11451145
if (TmpErrStat < AbortErrLev) then
11461146

@@ -1151,7 +1151,7 @@ subroutine IfW_Bladed_Init(InitInp, SumFileUnit, InitOut, G3D, FileDat, ErrStat,
11511151

11521152
call OpenBInpFile(UnitWind, TRIM(BinFileName), TmpErrStat, TmpErrMsg)
11531153
endif
1154-
!$OMP end critical(fileopen)
1154+
!$OMP end critical(fileopen_critical)
11551155
call SetErrStat(TmpErrStat, TmpErrMsg, ErrStat, ErrMsg, RoutineName)
11561156
if (ErrStat >= AbortErrLev) return
11571157

‎modules/inflowwind/src/InflowWind_Subs.f90

+2-2
Original file line numberDiff line numberDiff line change
@@ -1560,10 +1560,10 @@ SUBROUTINE InflowWind_OpenSumFile( SumFileUnit, SummaryName, IfW_Prog, WindType,
15601560
ErrMsg = ""
15611561

15621562
SumFileUnit = -1
1563-
!$OMP critical(fileopen)
1563+
!$OMP critical(fileopen_critical)
15641564
CALL GetNewUnit( SumFileUnit )
15651565
CALL OpenFOutFile ( SumFileUnit, SummaryName, ErrStat, ErrMsg )
1566-
!$OMP end critical(fileopen)
1566+
!$OMP end critical(fileopen_critical)
15671567
IF (ErrStat >=AbortErrLev) RETURN
15681568

15691569

‎modules/nwtc-library/src/NWTC_IO.f90

+8-8
Original file line numberDiff line numberDiff line change
@@ -2494,7 +2494,7 @@ SUBROUTINE OpenEcho ( Un, OutFile, ErrStat, ErrMsg, ProgVer )
24942494

24952495
! Get a unit number for the echo file:
24962496

2497-
!$OMP critical(fileopenNWTCio)
2497+
!$OMP critical(fileopenNWTCio_critical)
24982498
IF ( Un < 0 ) THEN
24992499
CALL GetNewUnit( Un, ErrStat2, ErrMsg2 )
25002500
CALL SetErrStat(ErrStat2, ErrMsg2,ErrStat, ErrMsg, RoutineName )
@@ -2505,7 +2505,7 @@ SUBROUTINE OpenEcho ( Un, OutFile, ErrStat, ErrMsg, ProgVer )
25052505

25062506
CALL OpenFOutFile( Un, OutFile, ErrStat2, ErrMsg2 )
25072507
CALL SetErrStat(ErrStat2, ErrMsg2,ErrStat, ErrMsg, RoutineName )
2508-
!$OMP end critical(fileopenNWTCio)
2508+
!$OMP end critical(fileopenNWTCio_critical)
25092509
IF ( ErrStat >= AbortErrLev ) RETURN
25102510

25112511

@@ -4732,13 +4732,13 @@ RECURSIVE SUBROUTINE ReadComFile ( FileInfo, FileIndx, AryInd, StartLine, LastLi
47324732
RETURN
47334733
END IF
47344734

4735-
!$OMP critical(fileopenNWTCio)
4735+
!$OMP critical(fileopenNWTCio_critical)
47364736
CALL GetNewUnit ( UnIn, ErrStatLcl, ErrMsg2 )
47374737
CALL SetErrStat( ErrStatLcl, ErrMsg2, ErrStat, ErrMsg, RoutineName )
47384738

47394739
CALL OpenFInpFile ( UnIn, FileInfo%FileList(FileIndx), ErrStatLcl, ErrMsg2 )
47404740
CALL SetErrStat( ErrStatLcl, ErrMsg2, ErrStat, ErrMsg, RoutineName )
4741-
!$OMP end critical(fileopenNWTCio)
4741+
!$OMP end critical(fileopenNWTCio_critical)
47424742
IF ( ErrStat >= AbortErrLev ) RETURN
47434743

47444744

@@ -6668,11 +6668,11 @@ RECURSIVE SUBROUTINE ScanComFile ( FirstFile, ThisFile, LastFile, StartLine, Las
66686668

66696669
! Open the input file.
66706670
UnIn = -1
6671-
!$OMP critical(fileopenNWTCio)
6671+
!$OMP critical(fileopenNWTCio_critical)
66726672
CALL GetNewUnit ( UnIn, ErrStatLcl, ErrMsg2 )
66736673

66746674
CALL OpenFInpFile ( UnIn, Filename, ErrStatLcl, ErrMsg2 )
6675-
!$OMP end critical(fileopenNWTCio)
6675+
!$OMP end critical(fileopenNWTCio_critical)
66766676
IF ( ErrStatLcl /= 0 ) THEN
66776677
CALL SetErrStat( ErrStatLcl, ErrMsg2, ErrStat, ErrMsg, RoutineName )
66786678
CALL Cleanup()
@@ -6980,7 +6980,7 @@ SUBROUTINE WrBinFAST(FileName, FileID, DescStr, ChanName, ChanUnit, TimeData, Al
69806980

69816981
! Generate the unit number for the binary file
69826982
UnIn = 0
6983-
!$OMP critical(fileopenNWTCio)
6983+
!$OMP critical(fileopenNWTCio_critical)
69846984
CALL GetNewUnit( UnIn, ErrStat2, ErrMsg2 )
69856985
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
69866986

@@ -6990,7 +6990,7 @@ SUBROUTINE WrBinFAST(FileName, FileID, DescStr, ChanName, ChanUnit, TimeData, Al
69906990

69916991
CALL OpenBOutFile ( UnIn, TRIM(FileName), ErrStat2, ErrMsg2 )
69926992
CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
6993-
!$OMP end critical(fileopenNWTCio)
6993+
!$OMP end critical(fileopenNWTCio_critical)
69946994
IF ( ErrStat >= AbortErrLev ) THEN
69956995
CALL Cleanup()
69966996
RETURN

0 commit comments

Comments
 (0)