[BugFix] OMP critical names preventing Intel+OMP compilation

modules/aerodyn/src/AeroDyn_IO.f90

@@ -1446,10 +1446,10 @@ SUBROUTINE ReadBladeInputs ( ADBlFile, BladeKInputFileData, AeroProjMod, UnEc, c
    UnIn = -1
 
    ! Open the input file for blade K.
-   !$OMP critical(filename)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit( UnIn, ErrStat2, ErrMsg2 )
    CALL OpenFInpFile ( UnIn, ADBlFile, ErrStat2, ErrMsg2 )
-   !$OMP end critical(filename)
+   !$OMP end critical(fileopen_critical)
       CALL SetErrStat(ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName)
       IF ( ErrStat >= AbortErrLev ) RETURN
 
@@ -1752,10 +1752,10 @@ SUBROUTINE AD_PrintSum( InputFileData, p, p_AD, u, y, NumBlades, BladeInputFileD
 
    ! Open the summary file and give it a heading.
 
-   !$OMP critical(filename)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit( UnSu, ErrStat, ErrMsg )
    CALL OpenFOutFile ( UnSu, TRIM( p%RootName )//'.sum', ErrStat, ErrMsg )
-   !$OMP end critical(filename)
+   !$OMP end critical(fileopen_critical)
    IF ( ErrStat >= AbortErrLev ) RETURN
 
       ! Heading:

modules/aerodyn/src/AirfoilInfo.f90

@@ -1932,12 +1932,12 @@ subroutine AFI_WrHeader(delim, FileName, unOutFile, ErrStat, ErrMsg)
    ChanName(i) = 'alphaBreakLower';   ChanUnit(i) = '(deg)';      i = i+1;
    ChanName(i) = 'CnBreakLower';      ChanUnit(i) = '(-)';        i = i+1;
 
-   !$OMP critical(filename)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit( unOutFile, ErrStat, ErrMsg )
    if (ErrStat < AbortErrLev) then
       CALL OpenFOutFile ( unOutFile, trim(FileName), ErrStat2, ErrMsg2 )
    endif
-   !$OMP end critical(filename)
+   !$OMP end critical(fileopen_critical)
 
    ! Generate file outputs
 
@@ -2110,12 +2110,12 @@ subroutine AFI_WrTables(AFI_Params,UAMod,OutRootName)
 
 
       ! Write to file
-      !$OMP critical(filename)
+      !$OMP critical(fileopen_critical)
       CALL GetNewUnit( unOutFile, ErrStat, ErrMsg )
       if (ErrStat < AbortErrLev) then
          CALL OpenFOutFile ( unOutFile, trim(OutRootName)//'.Coefs.'//trim(num2lstr(iTab))//'.out', ErrStat, ErrMsg )
       endif
-      !$OMP end critical(filename)
+      !$OMP end critical(fileopen_critical)
          if (ErrStat >= AbortErrLev) then
             call WrScr(Trim(ErrMsg))
             return

modules/aerodyn/src/UnsteadyAero.f90

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

modules/awae/src/AWAE_IO.f90

@@ -505,10 +505,10 @@ SUBROUTINE AWAE_PrintSum(  p, u, y, ErrStat, ErrMsg )
 
    ! Open the summary file and give it a heading.
 
-   !$OMP critical(fileopen)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit( UnSu, ErrStat, ErrMsg )
    CALL OpenFOutFile ( UnSu, TRIM( p%OutFileRoot )//'.sum', ErrStat, ErrMsg )
-   !$OMP end critical(fileopen)
+   !$OMP end critical(fileopen_critical)
    IF ( ErrStat >= AbortErrLev ) RETURN
 
 

modules/beamdyn/src/BeamDyn_IO.f90

@@ -588,11 +588,11 @@ SUBROUTINE BD_ReadPrimaryFile(InputFile,InputFileData,OutFileRoot,UnEc,ErrStat,E
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
 
 
-   !$OMP critical(filename)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit(UnIn,ErrStat2,ErrMsg2)
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
    CALL OpenFInpFile(UnIn,InputFile,ErrStat2,ErrMsg2)
-   !$OMP end critical(filename)
+   !$OMP end critical(fileopen_critical)
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
       IF (ErrStat >= AbortErrLev) then
          call cleanup()
@@ -1052,11 +1052,11 @@ SUBROUTINE BD_ReadBladeFile(BldFile,BladeInputFileData,UnEc,ErrStat,ErrMsg)
    ErrStat = ErrID_None
    ErrMsg  = ""
 
-   !$OMP critical(filename)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit(UnIn,ErrStat2,ErrMsg2)
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
    CALL OpenFInpFile (UnIn,BldFile,ErrStat2,ErrMsg2)
-   !$OMP end critical(filename)
+   !$OMP end critical(fileopen_critical)
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
          if (ErrStat >= AbortErrLev) then
             return
@@ -1946,10 +1946,10 @@ SUBROUTINE BD_PrintSum( p, x, OtherState, m, InitInp, ErrStat, ErrMsg )
 
    ! Open the summary file and give it a heading.
 
-   !$OMP critical(filename)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit( UnSu, ErrStat, ErrMsg )
    CALL OpenFOutFile ( UnSu, TRIM( InitInp%RootName )//'.sum.yaml', ErrStat, ErrMsg )
-   !$OMP end critical(filename)
+   !$OMP end critical(fileopen_critical)
    IF ( ErrStat >= AbortErrLev ) RETURN
 
       ! Heading:

modules/elastodyn/src/ElastoDyn.f90

@@ -9759,12 +9759,12 @@ SUBROUTINE ED_PrintSum( p, OtherState, ErrStat, ErrMsg )
 
    ! Open the summary file and give it a heading.
 
-   !$OMP critical(filename)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit( UnSu, ErrStat, ErrMsg )
    if (ErrStat < AbortErrLev) then
       CALL OpenFOutFile ( UnSu, TRIM( p%RootName )//'.sum', ErrStat, ErrMsg )
    endif
-   !$OMP end critical(filename)
+   !$OMP end critical(fileopen_critical)
    IF ( ErrStat /= ErrID_None ) RETURN
 
 

modules/elastodyn/src/ElastoDyn_IO.f90

@@ -2064,13 +2064,13 @@ SUBROUTINE ReadTowerFile( TwrFile, InputFileData, UnEc, ErrStat, ErrMsg )
    ErrMsg   =  ""
 
 
-   !$OMP critical(filename)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit( UnIn, ErrStat, ErrMsg )
    IF ( ErrStat < AbortErrLev ) THEN
       ! Open the tower input file.
       CALL OpenFInpFile ( UnIn, TwrFile, ErrStat2, ErrMsg2 )
    ENDIF
-   !$OMP end critical(filename)
+   !$OMP end critical(fileopen_critical)
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
       IF ( ErrStat >= AbortErrLev ) THEN
          CALL Cleanup()
@@ -2407,13 +2407,13 @@ SUBROUTINE ReadPrimaryFile( InputFile, InputFileData, BldFile, FurlFile, TwrFile
 
 
       ! Get an available unit number for the file.
-   !$OMP critical(filename)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit( UnIn, ErrStat, ErrMsg )
    IF ( ErrStat < AbortErrLev ) THEN
       ! Open the Primary input file.
       CALL OpenFInpFile ( UnIn, InputFile, ErrStat2, ErrMsg2 )
    ENDIF
-   !$OMP end critical(filename)
+   !$OMP end critical(fileopen_critical)
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
       IF ( ErrStat >= AbortErrLev ) THEN
          CALL Cleanup()

modules/hydrodyn/src/HydroDyn_Output.f90

@@ -797,10 +797,10 @@ SUBROUTINE HDOut_OpenSum( UnSum, SummaryName, HD_Prog, ErrStat, ErrMsg )
    ErrStat = ErrID_None         
    ErrMsg  = ""       
 
-   !$OMP critical(fileopen)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit( UnSum )
    CALL OpenFOutFile ( UnSum, SummaryName, ErrStat, ErrMsg ) 
-   !$OMP end critical(fileopen)
+   !$OMP end critical(fileopen_critical)
    IF (ErrStat >=AbortErrLev) RETURN
 
 
@@ -1124,10 +1124,10 @@ SUBROUTINE HDOut_OpenOutput( HydroDyn_ProgDesc, OutRootName,  p, InitOut, ErrSta
          ! Open the file for output
       OutFileName = TRIM(OutRootName)//'.out'
 
-      !$OMP critical(fileopen)
+      !$OMP critical(fileopen_critical)
       CALL GetNewUnit( p%UnOutFile )
       CALL OpenFOutFile ( p%UnOutFile, OutFileName, ErrStat, ErrMsg ) 
-      !$OMP end critical(fileopen)
+      !$OMP end critical(fileopen_critical)
       IF (ErrStat >=AbortErrLev) RETURN
 
 

modules/hydrodyn/src/WAMIT2.f90

@@ -3106,13 +3106,13 @@ SUBROUTINE Read_DataFile3D( InitInp, Filename3D, Data3D, ErrStat, Errmsg )
          !------------------------------------------------------------------------------
 
          ! Find a unit number to use
-      !$OMP critical(fileopen)
+      !$OMP critical(fileopen_critical)
       CALL GetNewUnit(UnitDataFile,ErrStatTmp,ErrMsgTmp)
       if (ErrStatTmp < AbortErrLev) then
             ! Open the file
          CALL OpenFInpFile(  UnitDataFile, TRIM(Filename3D), ErrStat, ErrMsg )  ! Open file containing mean drift information
       endif
-      !$OMP end critical(fileopen)
+      !$OMP end critical(fileopen_critical)
       CALL SetErrStat( ErrStatTmp, ErrMsgTmp, ErrStat, ErrMsg, RoutineName)
       IF ( ErrStat >= AbortErrLev ) THEN
          UnitDataFile = -1
@@ -3777,13 +3777,13 @@ SUBROUTINE Read_DataFile4D( InitInp, Filename4D, Data4D, ErrStat, Errmsg )
          !------------------------------------------------------------------------------
 
          ! Find a unit number to use
-      !$OMP critical(fileopen)
+      !$OMP critical(fileopen_critical)
       CALL GetNewUnit(UnitDataFile,ErrStatTmp,ErrMsgTmp)
       if (ErrStatTmp < AbortErrLev) then
          ! Open the file
          CALL OpenFInpFile(  UnitDataFile, TRIM(Filename4D), ErrStatTmp, ErrMsgTmp )  ! Open file containing mean drift information
       endif
-      !$OMP end critical(fileopen)
+      !$OMP end critical(fileopen_critical)
       CALL SetErrStat( ErrStatTmp, ErrMsgTmp, ErrStat, ErrMsg, RoutineName)
       IF ( ErrStat >= AbortErrLev ) THEN
          CLOSE( UnitDataFile )

modules/inflowwind/src/InflowWind_IO.f90

@@ -534,13 +534,13 @@ subroutine IfW_TurbSim_Init(InitInp, SumFileUnit, G3D, FileDat, ErrStat, ErrMsg)
    !----------------------------------------------------------------------------
 
    ! Get a unit number to use for the wind file
-   !$OMP critical(fileopen)
+   !$OMP critical(fileopen_critical)
    call GetNewUnit(WindFileUnit, TmpErrStat, TmpErrMsg)
    if (TmpErrStat < AbortErrLev) then
       ! Open binary file
       call OpenBInpFile(WindFileUnit, TRIM(InitInp%WindFileName), TmpErrStat, TmpErrMsg)
    endif
-   !$OMP end critical(fileopen)
+   !$OMP end critical(fileopen_critical)
    call SetErrStat(TmpErrStat, TmpErrMsg, ErrStat, ErrMsg, RoutineName)
    if (ErrStat >= AbortErrLev) return
 
@@ -904,13 +904,13 @@ subroutine IfW_HAWC_Init(InitInp, SumFileUnit, G3D, FileDat, ErrStat, ErrMsg)
    do IC = 1, G3D%NComp
 
       ! Get a unit number to use for the wind file
-      !$OMP critical(fileopen)
+      !$OMP critical(fileopen_critical)
       call GetNewUnit(WindFileUnit, TmpErrStat, TmpErrMsg)
       if (TmpErrStat < AbortErrLev) then
          ! Open wind file for this component
          call OpenBInpFile(WindFileUnit, InitInp%WindFileName(IC), TmpErrStat, TmpErrMsg)
       endif
-      !$OMP end critical(fileopen)
+      !$OMP end critical(fileopen_critical)
       call SetErrStat(TmpErrStat, TmpErrMsg, ErrStat, ErrMsg, RoutineName)
       if (ErrStat >= AbortErrLev) return
 
@@ -1140,7 +1140,7 @@ subroutine IfW_Bladed_Init(InitInp, SumFileUnit, InitOut, G3D, FileDat, ErrStat,
    end if
 
    ! Get a unit number to use
-   !$OMP critical(fileopen)
+   !$OMP critical(fileopen_critical)
    call GetNewUnit(UnitWind, TmpErrStat, TmpErrMsg)
    if (TmpErrStat < AbortErrLev) then
 
@@ -1151,7 +1151,7 @@ subroutine IfW_Bladed_Init(InitInp, SumFileUnit, InitOut, G3D, FileDat, ErrStat,
 
       call OpenBInpFile(UnitWind, TRIM(BinFileName), TmpErrStat, TmpErrMsg)
    endif
-   !$OMP end critical(fileopen)
+   !$OMP end critical(fileopen_critical)
    call SetErrStat(TmpErrStat, TmpErrMsg, ErrStat, ErrMsg, RoutineName)
    if (ErrStat >= AbortErrLev) return
 

modules/inflowwind/src/InflowWind_Subs.f90

@@ -1560,10 +1560,10 @@ SUBROUTINE InflowWind_OpenSumFile( SumFileUnit, SummaryName, IfW_Prog, WindType,
    ErrMsg  = ""
 
    SumFileUnit = -1
-   !$OMP critical(fileopen)
+   !$OMP critical(fileopen_critical)
    CALL GetNewUnit( SumFileUnit )
    CALL OpenFOutFile ( SumFileUnit, SummaryName, ErrStat, ErrMsg )
-   !$OMP end critical(fileopen)
+   !$OMP end critical(fileopen_critical)
    IF (ErrStat >=AbortErrLev) RETURN
 
 

modules/nwtc-library/src/NWTC_IO.f90

@@ -2494,7 +2494,7 @@ SUBROUTINE OpenEcho ( Un, OutFile, ErrStat, ErrMsg, ProgVer )
 
       ! Get a unit number for the echo file:
 
-   !$OMP critical(fileopenNWTCio)
+   !$OMP critical(fileopenNWTCio_critical)
    IF ( Un < 0 ) THEN
       CALL GetNewUnit( Un, ErrStat2, ErrMsg2 )
          CALL SetErrStat(ErrStat2, ErrMsg2,ErrStat, ErrMsg, RoutineName )
@@ -2505,7 +2505,7 @@ SUBROUTINE OpenEcho ( Un, OutFile, ErrStat, ErrMsg, ProgVer )
 
    CALL OpenFOutFile( Un, OutFile, ErrStat2, ErrMsg2 )
       CALL SetErrStat(ErrStat2, ErrMsg2,ErrStat, ErrMsg, RoutineName )
-   !$OMP end critical(fileopenNWTCio)
+   !$OMP end critical(fileopenNWTCio_critical)
       IF ( ErrStat >= AbortErrLev ) RETURN
 
 
@@ -4732,13 +4732,13 @@ RECURSIVE SUBROUTINE ReadComFile ( FileInfo, FileIndx, AryInd, StartLine, LastLi
       RETURN
    END IF
 
-   !$OMP critical(fileopenNWTCio)
+   !$OMP critical(fileopenNWTCio_critical)
    CALL GetNewUnit ( UnIn, ErrStatLcl, ErrMsg2 )
       CALL SetErrStat( ErrStatLcl, ErrMsg2, ErrStat, ErrMsg, RoutineName )
 
    CALL OpenFInpFile ( UnIn, FileInfo%FileList(FileIndx), ErrStatLcl, ErrMsg2 )
       CALL SetErrStat( ErrStatLcl, ErrMsg2, ErrStat, ErrMsg, RoutineName )
-   !$OMP end critical(fileopenNWTCio)
+   !$OMP end critical(fileopenNWTCio_critical)
       IF ( ErrStat >= AbortErrLev )  RETURN
 
 
@@ -6668,11 +6668,11 @@ RECURSIVE SUBROUTINE ScanComFile ( FirstFile, ThisFile, LastFile, StartLine, Las
 
          ! Open the input file.
       UnIn = -1
-      !$OMP critical(fileopenNWTCio)
+      !$OMP critical(fileopenNWTCio_critical)
       CALL GetNewUnit ( UnIn, ErrStatLcl, ErrMsg2 )
 
       CALL OpenFInpFile ( UnIn, Filename, ErrStatLcl, ErrMsg2 )
-      !$OMP end critical(fileopenNWTCio)
+      !$OMP end critical(fileopenNWTCio_critical)
       IF ( ErrStatLcl /= 0 )  THEN
          CALL SetErrStat( ErrStatLcl, ErrMsg2, ErrStat, ErrMsg, RoutineName )
          CALL Cleanup()
@@ -6980,7 +6980,7 @@ SUBROUTINE WrBinFAST(FileName, FileID, DescStr, ChanName, ChanUnit, TimeData, Al
 
       ! Generate the unit number for the binary file
    UnIn = 0
-   !$OMP critical(fileopenNWTCio)
+   !$OMP critical(fileopenNWTCio_critical)
    CALL GetNewUnit( UnIn, ErrStat2, ErrMsg2 )
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
 
@@ -6990,7 +6990,7 @@ SUBROUTINE WrBinFAST(FileName, FileID, DescStr, ChanName, ChanUnit, TimeData, Al
 
    CALL OpenBOutFile ( UnIn, TRIM(FileName), ErrStat2, ErrMsg2 )
       CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
-   !$OMP end critical(fileopenNWTCio)
+   !$OMP end critical(fileopenNWTCio_critical)
       IF ( ErrStat >= AbortErrLev ) THEN
          CALL Cleanup()
          RETURN