Merge commit 'v2.0.1-949-g868fccc'

2017-10-08 22:19:48 +02:00 · 2017-10-08 22:19:48 +02:00 · 7440dbd69c
parent 778c60c233 868fccc495
commit 7440dbd69c
60 changed files with 294 additions and 61 deletions
--- a/src/CPFEM.f90
+++ b/src/CPFEM.f90
@ -113,7 +113,11 @@ end subroutine CPFEM_initAll
 !> @brief allocate the arrays defined in module CPFEM and initialize them
 !--------------------------------------------------------------------------------------------------
 subroutine CPFEM_init
- use, intrinsic :: iso_fortran_env                                                                 ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pInt
 use IO, only: &
--- a/src/CPFEM2.f90
+++ b/src/CPFEM2.f90
@ -82,7 +82,11 @@ end subroutine CPFEM_initAll
 !> @brief allocate the arrays defined in module CPFEM and initialize them
 !--------------------------------------------------------------------------------------------------
 subroutine CPFEM_init
- use, intrinsic :: iso_fortran_env                                                                 ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pInt
 use IO, only: &
--- a/src/DAMASK_marc2017.f90
+++ b/src/DAMASK_marc2017.f90
@ -0,0 +1 @@
+DAMASK_marc.f90
--- a/src/DAMASK_spectral.f90
+++ b/src/DAMASK_spectral.f90
@ -7,8 +7,11 @@
 !> results
 !--------------------------------------------------------------------------------------------------
 program DAMASK_spectral
- use, intrinsic :: &
-   iso_fortran_env                                                                                  ! to get compiler_version and compiler_options (at least for gfortran >4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pInt, &
   pLongInt, &
--- a/src/FEsolving.f90
+++ b/src/FEsolving.f90
@ -43,7 +43,11 @@ contains
 !> solver the information is provided by the interface module
 !--------------------------------------------------------------------------------------------------
 subroutine FE_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level, &
   debug_FEsolving, &
--- a/src/IO.f90
+++ b/src/IO.f90
@ -81,7 +81,11 @@ contains
 !> @brief only outputs revision number
 !--------------------------------------------------------------------------------------------------
 subroutine IO_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 
 implicit none

--- a/src/constitutive.f90
+++ b/src/constitutive.f90
@ -37,7 +37,11 @@ contains
 !> @brief allocates arrays pointing to array of the various constitutive modules
 !--------------------------------------------------------------------------------------------------
 subroutine constitutive_init()
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pReal
 use debug, only: &
--- a/src/crystallite.f90
+++ b/src/crystallite.f90
@ -137,7 +137,11 @@ contains
 !> @brief allocates and initialize per grain variables
 !--------------------------------------------------------------------------------------------------
 subroutine crystallite_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_info, &
   debug_reset, &
--- a/src/damage_local.f90
+++ b/src/damage_local.f90
@ -41,7 +41,11 @@ contains
 !> @brief allocates all neccessary fields, reads information from material configuration file
 !--------------------------------------------------------------------------------------------------
 subroutine damage_local_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                         ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_read, &
   IO_lc, &
--- a/src/damage_none.f90
+++ b/src/damage_none.f90
@ -16,7 +16,11 @@ contains
 !> @brief allocates all neccessary fields, reads information from material configuration file
 !--------------------------------------------------------------------------------------------------
 subroutine damage_none_init()
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pInt 
 use IO, only: &
--- a/src/damage_nonlocal.f90
+++ b/src/damage_nonlocal.f90
@ -46,7 +46,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine damage_nonlocal_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_read, &
   IO_lc, &
--- a/src/debug.f90
+++ b/src/debug.f90
@ -102,7 +102,11 @@ contains
 !> @brief reads in parameters from debug.config and allocates arrays
 !--------------------------------------------------------------------------------------------------
 subroutine debug_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use numerics, only: &
   nStress, &
   nState, &
--- a/src/homogenization.f90
+++ b/src/homogenization.f90
@ -71,7 +71,11 @@ contains
 !> @brief module initialization
 !--------------------------------------------------------------------------------------------------
 subroutine homogenization_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use math, only: &
   math_I3
 use debug, only: &
--- a/src/homogenization_RGC.f90
+++ b/src/homogenization_RGC.f90
@ -72,7 +72,11 @@ contains
 !> @brief allocates all neccessary fields, reads information from material configuration file
 !--------------------------------------------------------------------------------------------------
 subroutine homogenization_RGC_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pReal, &
   pInt 
--- a/src/homogenization_isostrain.f90
+++ b/src/homogenization_isostrain.f90
@ -49,7 +49,11 @@ contains
 !> @brief allocates all neccessary fields, reads information from material configuration file
 !--------------------------------------------------------------------------------------------------
 subroutine homogenization_isostrain_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pReal
 use debug, only: &
--- a/src/homogenization_none.f90
+++ b/src/homogenization_none.f90
@ -18,7 +18,11 @@ contains
 !> @brief allocates all neccessary fields, reads information from material configuration file
 !--------------------------------------------------------------------------------------------------
 subroutine homogenization_none_init()
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pReal, &
   pInt 
--- a/src/hydrogenflux_cahnhilliard.f90
+++ b/src/hydrogenflux_cahnhilliard.f90
@ -51,7 +51,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine hydrogenflux_cahnhilliard_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_read, &
   IO_lc, &
--- a/src/hydrogenflux_isoconc.f90
+++ b/src/hydrogenflux_isoconc.f90
@ -16,7 +16,11 @@ contains
 !> @brief allocates all neccessary fields, reads information from material configuration file
 !--------------------------------------------------------------------------------------------------
 subroutine hydrogenflux_isoconc_init()
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pReal, &
   pInt 
--- a/src/kinematics_cleavage_opening.f90
+++ b/src/kinematics_cleavage_opening.f90
@ -51,7 +51,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine kinematics_cleavage_opening_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/kinematics_hydrogen_strain.f90
+++ b/src/kinematics_hydrogen_strain.f90
@ -41,7 +41,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine kinematics_hydrogen_strain_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/kinematics_slipplane_opening.f90
+++ b/src/kinematics_slipplane_opening.f90
@ -51,7 +51,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine kinematics_slipplane_opening_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/kinematics_thermal_expansion.f90
+++ b/src/kinematics_thermal_expansion.f90
@ -41,7 +41,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine kinematics_thermal_expansion_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/kinematics_vacancy_strain.f90
+++ b/src/kinematics_vacancy_strain.f90
@ -41,7 +41,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine kinematics_vacancy_strain_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/lattice.f90
+++ b/src/lattice.f90
@ -1243,7 +1243,11 @@ contains
 !> @brief Module initialization
 !--------------------------------------------------------------------------------------------------
 subroutine lattice_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_open_file,&
   IO_open_jobFile_stat, &
--- a/src/material.f90
+++ b/src/material.f90
@ -367,7 +367,11 @@ contains
 !> material.config
 !--------------------------------------------------------------------------------------------------
 subroutine material_init()
- use, intrinsic :: iso_fortran_env                             ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_error, &
   IO_open_file, &
--- a/src/math.f90
+++ b/src/math.f90
@ -172,7 +172,11 @@ contains
 !--------------------------------------------------------------------------------------------------
 subroutine math_init

- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use numerics, only: fixedSeed
 use IO,       only: IO_timeStamp

--- a/src/mesh.f90
+++ b/src/mesh.f90
@ -472,7 +472,11 @@ contains
 !! Order and routines strongly depend on type of solver
 !--------------------------------------------------------------------------------------------------
 subroutine mesh_init(ip,el)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use DAMASK_interface
 use IO, only: &
 #ifdef Abaqus
--- a/src/numerics.f90
+++ b/src/numerics.f90
@ -198,7 +198,11 @@ contains
 ! a sanity check
 !--------------------------------------------------------------------------------------------------
 subroutine numerics_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_read, &
   IO_error, &
--- a/src/plastic_disloUCLA.f90
+++ b/src/plastic_disloUCLA.f90
@ -119,7 +119,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine plastic_disloUCLA_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/plastic_dislotwin.f90
+++ b/src/plastic_dislotwin.f90
@ -198,7 +198,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine plastic_dislotwin_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   dEq0, &
   dNeq0, &
--- a/src/plastic_isotropic.f90
+++ b/src/plastic_isotropic.f90
@ -90,7 +90,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine plastic_isotropic_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level, &
   debug_constitutive, &
--- a/src/plastic_none.f90
+++ b/src/plastic_none.f90
@ -26,7 +26,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine plastic_none_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level, &
   debug_constitutive, &
--- a/src/plastic_phenoplus.f90
+++ b/src/plastic_phenoplus.f90
@ -111,7 +111,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine plastic_phenoplus_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   dEq0
 use debug, only: &
--- a/src/plastic_phenopowerlaw.f90
+++ b/src/plastic_phenopowerlaw.f90
@ -123,7 +123,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine plastic_phenopowerlaw_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   dEq0
 use debug, only: &
--- a/src/plastic_titanmod.f90
+++ b/src/plastic_titanmod.f90
@ -184,7 +184,11 @@ module plastic_titanmod
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine plastic_titanmod_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                        ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/porosity_none.f90
+++ b/src/porosity_none.f90
@ -16,7 +16,11 @@ contains
 !> @brief allocates all neccessary fields, reads information from material configuration file
 !--------------------------------------------------------------------------------------------------
 subroutine porosity_none_init()
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pReal, &
   pInt 
--- a/src/porosity_phasefield.f90
+++ b/src/porosity_phasefield.f90
@ -48,7 +48,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine porosity_phasefield_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_read, &
   IO_lc, &
--- a/src/prec.f90
+++ b/src/prec.f90
@ -111,8 +111,11 @@ contains
 !> @brief reporting precision
 !--------------------------------------------------------------------------------------------------
 subroutine prec_init
- use, intrinsic :: &
-   iso_fortran_env                                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif

 implicit none
 external :: &
--- a/src/source_damage_anisoBrittle.f90
+++ b/src/source_damage_anisoBrittle.f90
@ -63,7 +63,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine source_damage_anisoBrittle_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/source_damage_anisoDuctile.f90
+++ b/src/source_damage_anisoDuctile.f90
@ -67,7 +67,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine source_damage_anisoDuctile_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/source_damage_isoBrittle.f90
+++ b/src/source_damage_isoBrittle.f90
@ -53,7 +53,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine source_damage_isoBrittle_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/source_damage_isoDuctile.f90
+++ b/src/source_damage_isoDuctile.f90
@ -53,7 +53,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine source_damage_isoDuctile_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/source_thermal_dissipation.f90
+++ b/src/source_thermal_dissipation.f90
@ -39,7 +39,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine source_thermal_dissipation_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/source_thermal_externalheat.f90
+++ b/src/source_thermal_externalheat.f90
@ -45,7 +45,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine source_thermal_externalheat_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/source_vacancy_irradiation.f90
+++ b/src/source_vacancy_irradiation.f90
@ -41,7 +41,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine source_vacancy_irradiation_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/source_vacancy_phenoplasticity.f90
+++ b/src/source_vacancy_phenoplasticity.f90
@ -39,7 +39,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine source_vacancy_phenoplasticity_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/source_vacancy_thermalfluc.f90
+++ b/src/source_vacancy_thermalfluc.f90
@ -41,7 +41,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine source_vacancy_thermalfluc_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use debug, only: &
   debug_level,&
   debug_constitutive,&
--- a/src/spectral_damage.f90
+++ b/src/spectral_damage.f90
@ -60,7 +60,11 @@ contains
 !> @brief allocates all neccessary fields and fills them with data, potentially from restart info
 !--------------------------------------------------------------------------------------------------
 subroutine spectral_damage_init()
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran >4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_intOut, &
   IO_read_realFile, &
--- a/src/spectral_interface.f90
+++ b/src/spectral_interface.f90
@ -42,7 +42,9 @@ contains
 !! information on computation to screen
 !--------------------------------------------------------------------------------------------------
 subroutine DAMASK_interface_init()
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+ use, intrinsic :: &
+   iso_fortran_env
+
 use system_routines, only: &
   getHostName

--- a/src/spectral_mech_AL.f90
+++ b/src/spectral_mech_AL.f90
@ -84,7 +84,11 @@ contains
 !> @todo use sourced allocation, e.g. allocate(Fdot,source = F_lastInc)
 !--------------------------------------------------------------------------------------------------
 subroutine AL_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran >4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_intOut, &
   IO_read_realFile, &
--- a/src/spectral_mech_Basic.f90
+++ b/src/spectral_mech_Basic.f90
@ -72,7 +72,11 @@ contains
 !> @brief allocates all neccessary fields and fills them with data, potentially from restart info
 !--------------------------------------------------------------------------------------------------
 subroutine basicPETSc_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran >4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_intOut, &
   IO_read_realFile, &
--- a/src/spectral_mech_Polarisation.f90
+++ b/src/spectral_mech_Polarisation.f90
@ -84,7 +84,11 @@ contains
 !> @todo use sourced allocation, e.g. allocate(Fdot,source = F_lastInc)
 !--------------------------------------------------------------------------------------------------
 subroutine Polarisation_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran >4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_intOut, &
   IO_read_realFile, &
--- a/src/spectral_thermal.f90
+++ b/src/spectral_thermal.f90
@ -60,7 +60,11 @@ contains
 !> @brief allocates all neccessary fields and fills them with data, potentially from restart info
 !--------------------------------------------------------------------------------------------------
 subroutine spectral_thermal_init
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran >4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_intOut, &
   IO_read_realFile, &
--- a/src/spectral_utilities.f90
+++ b/src/spectral_utilities.f90
@ -160,7 +160,11 @@ contains
 !> Initializes FFTW.
 !--------------------------------------------------------------------------------------------------
 subroutine utilities_init()
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran >4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_error, &
   IO_warning, &
--- a/src/thermal_adiabatic.f90
+++ b/src/thermal_adiabatic.f90
@ -46,7 +46,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine thermal_adiabatic_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_read, &
   IO_lc, &
--- a/src/thermal_conduction.f90
+++ b/src/thermal_conduction.f90
@ -47,7 +47,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine thermal_conduction_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_read, &
   IO_lc, &
--- a/src/thermal_isothermal.f90
+++ b/src/thermal_isothermal.f90
@ -16,7 +16,11 @@ contains
 !> @brief allocates all neccessary fields, reads information from material configuration file
 !--------------------------------------------------------------------------------------------------
 subroutine thermal_isothermal_init()
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pReal, &
   pInt 
--- a/src/vacancyflux_cahnhilliard.f90
+++ b/src/vacancyflux_cahnhilliard.f90
@ -61,7 +61,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine vacancyflux_cahnhilliard_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_read, &
   IO_lc, &
--- a/src/vacancyflux_isochempot.f90
+++ b/src/vacancyflux_isochempot.f90
@ -44,7 +44,11 @@ contains
 !> @details reads in material parameters, allocates arrays, and does sanity checks
 !--------------------------------------------------------------------------------------------------
 subroutine vacancyflux_isochempot_init(fileUnit)
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use IO, only: &
   IO_read, &
   IO_lc, &
--- a/src/vacancyflux_isoconc.f90
+++ b/src/vacancyflux_isoconc.f90
@ -16,7 +16,11 @@ contains
 !> @brief allocates all neccessary fields, reads information from material configuration file
 !--------------------------------------------------------------------------------------------------
 subroutine vacancyflux_isoconc_init()
- use, intrinsic :: iso_fortran_env                                                                  ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment)
+#ifdef __GFORTRAN__
+ use, intrinsic :: iso_fortran_env, only: &
+   compiler_version, &
+   compiler_options
+#endif
 use prec, only: &
   pReal, &
   pInt