Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CrysFML
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Scientific Software
CrysFML
Commits
1ada0c48
Commit
1ada0c48
authored
Jan 19, 2021
by
Ross JOHN ANGEL
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://code.ill.fr/scientific-software/crysfml
into Angel_Dec2020
parents
7f182c47
721fbba9
Pipeline
#9611
passed with stages
in 12 minutes and 55 seconds
Changes
159
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
159 changed files
with
1145 additions
and
1369 deletions
+1145
-1369
Cmake_help.inf
Cmake_help.inf
+4
-4
Program_Examples/BondStr/Scripts/Windows/make_bondstr_ifort.bat
...m_Examples/BondStr/Scripts/Windows/make_bondstr_ifort.bat
+2
-2
Program_Examples/BondStr/Src/Bond_Str.f90
Program_Examples/BondStr/Src/Bond_Str.f90
+8
-2
Src/CFML_Conf_Calc.f90
Src/CFML_Conf_Calc.f90
+4
-0
Src08/CFML_DiffPatt/DiffP_ReadPatterns.f90
Src08/CFML_DiffPatt/DiffP_ReadPatterns.f90
+0
-1
Src08/CFML_Diffpatt.f90
Src08/CFML_Diffpatt.f90
+0
-1
Src08/CFML_EnBVS/EnBVS_CostF.f90
Src08/CFML_EnBVS/EnBVS_CostF.f90
+0
-1
Src08/CFML_EnBVS/EnBVS_SetTab.f90
Src08/CFML_EnBVS/EnBVS_SetTab.f90
+0
-1
Src08/CFML_ExtinCorr.f90
Src08/CFML_ExtinCorr.f90
+0
-4
Src08/CFML_FFT.f90
Src08/CFML_FFT.f90
+368
-374
Src08/CFML_FFT/FFT_Convol.f90
Src08/CFML_FFT/FFT_Convol.f90
+0
-3
Src08/CFML_FFT/FFT_Gen.f90
Src08/CFML_FFT/FFT_Gen.f90
+0
-8
Src08/CFML_Geom/Geom_Allocations.f90
Src08/CFML_Geom/Geom_Allocations.f90
+0
-3
Src08/CFML_Geom/Geom_Angles.f90
Src08/CFML_Geom/Geom_Angles.f90
+0
-2
Src08/CFML_Geom/Geom_Distances.f90
Src08/CFML_Geom/Geom_Distances.f90
+0
-3
Src08/CFML_Geom/Geom_Matrices.f90
Src08/CFML_Geom/Geom_Matrices.f90
+0
-5
Src08/CFML_Geom/Geom_Orbits.f90
Src08/CFML_Geom/Geom_Orbits.f90
+0
-2
Src08/CFML_GlobalDeps_Linux_GFOR.f90
Src08/CFML_GlobalDeps_Linux_GFOR.f90
+9
-12
Src08/CFML_GlobalDeps_Linux_IFOR.f90
Src08/CFML_GlobalDeps_Linux_IFOR.f90
+9
-12
Src08/CFML_GlobalDeps_MacOS_GFOR.f90
Src08/CFML_GlobalDeps_MacOS_GFOR.f90
+9
-12
Src08/CFML_GlobalDeps_MacOs_IFOR.f90
Src08/CFML_GlobalDeps_MacOs_IFOR.f90
+9
-12
Src08/CFML_GlobalDeps_Windows_GFOR.f90
Src08/CFML_GlobalDeps_Windows_GFOR.f90
+9
-12
Src08/CFML_GlobalDeps_Windows_IFOR.f90
Src08/CFML_GlobalDeps_Windows_IFOR.f90
+9
-12
Src08/CFML_ILL_Instrm_Data.f90
Src08/CFML_ILL_Instrm_Data.f90
+1
-55
Src08/CFML_IOForm/Format_CIF.f90
Src08/CFML_IOForm/Format_CIF.f90
+2
-0
Src08/CFML_Maths.f90
Src08/CFML_Maths.f90
+10
-18
Src08/CFML_Maths/Math_Co_Linear.f90
Src08/CFML_Maths/Math_Co_Linear.f90
+0
-3
Src08/CFML_Maths/Math_Co_Prime.f90
Src08/CFML_Maths/Math_Co_Prime.f90
+0
-2
Src08/CFML_Maths/Math_Cross_Product.f90
Src08/CFML_Maths/Math_Cross_Product.f90
+0
-3
Src08/CFML_Maths/Math_Debye.f90
Src08/CFML_Maths/Math_Debye.f90
+0
-8
Src08/CFML_Maths/Math_Determinant.f90
Src08/CFML_Maths/Math_Determinant.f90
+0
-18
Src08/CFML_Maths/Math_Diagonalize_SH.f90
Src08/CFML_Maths/Math_Diagonalize_SH.f90
+0
-8
Src08/CFML_Maths/Math_Equal_Matrix.f90
Src08/CFML_Maths/Math_Equal_Matrix.f90
+0
-3
Src08/CFML_Maths/Math_Equal_Vector.f90
Src08/CFML_Maths/Math_Equal_Vector.f90
+0
-3
Src08/CFML_Maths/Math_Erfc_Der.f90
Src08/CFML_Maths/Math_Erfc_Der.f90
+0
-1
Src08/CFML_Maths/Math_Factorial.f90
Src08/CFML_Maths/Math_Factorial.f90
+0
-2
Src08/CFML_Maths/Math_In_Limits.f90
Src08/CFML_Maths/Math_In_Limits.f90
+0
-2
Src08/CFML_Maths/Math_Inverse_Matrix.f90
Src08/CFML_Maths/Math_Inverse_Matrix.f90
+0
-13
Src08/CFML_Maths/Math_Is_Diagonal_Matrix.f90
Src08/CFML_Maths/Math_Is_Diagonal_Matrix.f90
+0
-2
Src08/CFML_Maths/Math_Is_Null_Vector.f90
Src08/CFML_Maths/Math_Is_Null_Vector.f90
+0
-2
Src08/CFML_Maths/Math_Linear_Dependent.f90
Src08/CFML_Maths/Math_Linear_Dependent.f90
+0
-3
Src08/CFML_Maths/Math_Locate.f90
Src08/CFML_Maths/Math_Locate.f90
+0
-1
Src08/CFML_Maths/Math_Lower_Triangular.f90
Src08/CFML_Maths/Math_Lower_Triangular.f90
+0
-2
Src08/CFML_Maths/Math_Mat_Cross.f90
Src08/CFML_Maths/Math_Mat_Cross.f90
+0
-3
Src08/CFML_Maths/Math_Modulo_Lat.f90
Src08/CFML_Maths/Math_Modulo_Lat.f90
+0
-1
Src08/CFML_Maths/Math_Negligible.f90
Src08/CFML_Maths/Math_Negligible.f90
+0
-2
Src08/CFML_Maths/Math_Norm.f90
Src08/CFML_Maths/Math_Norm.f90
+0
-2
Src08/CFML_Maths/Math_Outerprod.f90
Src08/CFML_Maths/Math_Outerprod.f90
+0
-1
Src08/CFML_Maths/Math_Pgcd.f90
Src08/CFML_Maths/Math_Pgcd.f90
+0
-2
Src08/CFML_Maths/Math_Points_In_Line2D.f90
Src08/CFML_Maths/Math_Points_In_Line2D.f90
+0
-1
Src08/CFML_Maths/Math_Poly_Legendre.f90
Src08/CFML_Maths/Math_Poly_Legendre.f90
+0
-1
Src08/CFML_Maths/Math_Rank.f90
Src08/CFML_Maths/Math_Rank.f90
+0
-2
Src08/CFML_Maths/Math_Resolv_System.f90
Src08/CFML_Maths/Math_Resolv_System.f90
+0
-5
Src08/CFML_Maths/Math_Rotation_Axes.f90
Src08/CFML_Maths/Math_Rotation_Axes.f90
+0
-3
Src08/CFML_Maths/Math_RowEchelon.f90
Src08/CFML_Maths/Math_RowEchelon.f90
+0
-3
Src08/CFML_Maths/Math_Scalar.f90
Src08/CFML_Maths/Math_Scalar.f90
+0
-2
Src08/CFML_Maths/Math_SistCoord_Changes.f90
Src08/CFML_Maths/Math_SistCoord_Changes.f90
+0
-6
Src08/CFML_Maths/Math_Smoothing_Interpol.f90
Src08/CFML_Maths/Math_Smoothing_Interpol.f90
+0
-6
Src08/CFML_Maths/Math_Sort.f90
Src08/CFML_Maths/Math_Sort.f90
+0
-2
Src08/CFML_Maths/Math_Spher_Harm.f90
Src08/CFML_Maths/Math_Spher_Harm.f90
+0
-7
Src08/CFML_Maths/Math_Swap.f90
Src08/CFML_Maths/Math_Swap.f90
+0
-6
Src08/CFML_Maths/Math_Tensor_Product.f90
Src08/CFML_Maths/Math_Tensor_Product.f90
+0
-3
Src08/CFML_Maths/Math_Trace.f90
Src08/CFML_Maths/Math_Trace.f90
+0
-3
Src08/CFML_Maths/Math_Upper_Triangular.f90
Src08/CFML_Maths/Math_Upper_Triangular.f90
+0
-2
Src08/CFML_Maths/Math_Vec_Length.f90
Src08/CFML_Maths/Math_Vec_Length.f90
+0
-1
Src08/CFML_Maths/Math_Zbelong.f90
Src08/CFML_Maths/Math_Zbelong.f90
+0
-3
Src08/CFML_Messages/Win_Err_Message.f90
Src08/CFML_Messages/Win_Err_Message.f90
+0
-1
Src08/CFML_Messages/Win_Info_Message.f90
Src08/CFML_Messages/Win_Info_Message.f90
+0
-1
Src08/CFML_Messages/Win_Question_Message.f90
Src08/CFML_Messages/Win_Question_Message.f90
+0
-1
Src08/CFML_Messages/Win_Stop_Message.f90
Src08/CFML_Messages/Win_Stop_Message.f90
+0
-1
Src08/CFML_Messages/Win_Warning_Message.f90
Src08/CFML_Messages/Win_Warning_Message.f90
+0
-1
Src08/CFML_Messages/Win_Write_ScrollMsg.f90
Src08/CFML_Messages/Win_Write_ScrollMsg.f90
+0
-2
Src08/CFML_Metrics/Metrics_Gen.f90
Src08/CFML_Metrics/Metrics_Gen.f90
+0
-1
Src08/CFML_Metrics/Metrics_IO.f90
Src08/CFML_Metrics/Metrics_IO.f90
+0
-3
Src08/CFML_Metrics/Metrics_NiggliCell.f90
Src08/CFML_Metrics/Metrics_NiggliCell.f90
+0
-12
Src08/CFML_Metrics/Metrics_ThConver.f90
Src08/CFML_Metrics/Metrics_ThConver.f90
+0
-8
Src08/CFML_Optimization.f90
Src08/CFML_Optimization.f90
+0
-2
Src08/CFML_Optimization/OPT_Cg_Quasi_Newton.f90
Src08/CFML_Optimization/OPT_Cg_Quasi_Newton.f90
+0
-1
Src08/CFML_Optimization/OPT_Simplex.f90
Src08/CFML_Optimization/OPT_Simplex.f90
+0
-4
Src08/CFML_Optimization_LSQ.f90
Src08/CFML_Optimization_LSQ.f90
+0
-2
Src08/CFML_Optimization_SAnn/SAnn_SetnCheck.f90
Src08/CFML_Optimization_SAnn/SAnn_SetnCheck.f90
+0
-1
Src08/CFML_Optimization_SAnn/SAnn_inout.f90
Src08/CFML_Optimization_SAnn/SAnn_inout.f90
+0
-2
Src08/CFML_Profiles.f90
Src08/CFML_Profiles.f90
+0
-1
Src08/CFML_Profiles/Profile_BacktoBack.f90
Src08/CFML_Profiles/Profile_BacktoBack.f90
+0
-2
Src08/CFML_Profiles/Profile_Exponential.f90
Src08/CFML_Profiles/Profile_Exponential.f90
+0
-2
Src08/CFML_Profiles/Profile_Finger.f90
Src08/CFML_Profiles/Profile_Finger.f90
+0
-3
Src08/CFML_Profiles/Profile_Gaussian.f90
Src08/CFML_Profiles/Profile_Gaussian.f90
+0
-3
Src08/CFML_Profiles/Profile_Hat.f90
Src08/CFML_Profiles/Profile_Hat.f90
+0
-2
Src08/CFML_Profiles/Profile_IkedaCarpenter.f90
Src08/CFML_Profiles/Profile_IkedaCarpenter.f90
+0
-2
Src08/CFML_Profiles/Profile_Init_ProfVal.f90
Src08/CFML_Profiles/Profile_Init_ProfVal.f90
+0
-1
Src08/CFML_Profiles/Profile_Lorentzian.f90
Src08/CFML_Profiles/Profile_Lorentzian.f90
+0
-3
Src08/CFML_Profiles/Profile_PseudoVoigt.f90
Src08/CFML_Profiles/Profile_PseudoVoigt.f90
+0
-6
Src08/CFML_Profiles/Profile_TCHpVoigt.f90
Src08/CFML_Profiles/Profile_TCHpVoigt.f90
+0
-2
Src08/CFML_Profiles/Profile_TOF_Carpenter.f90
Src08/CFML_Profiles/Profile_TOF_Carpenter.f90
+0
-1
Src08/CFML_Profiles/Profile_TOF_Jorg_Vondreele.f90
Src08/CFML_Profiles/Profile_TOF_Jorg_Vondreele.f90
+0
-1
Src08/CFML_Profiles/Profile_TOF_Jorgensen.f90
Src08/CFML_Profiles/Profile_TOF_Jorgensen.f90
+0
-1
Src08/CFML_Propagk.f90
Src08/CFML_Propagk.f90
+0
-4
Src08/CFML_Random.f90
Src08/CFML_Random.f90
+0
-2
Src08/CFML_Random/Random_Beta.f90
Src08/CFML_Random/Random_Beta.f90
+0
-1
Src08/CFML_Random/Random_Binomial.f90
Src08/CFML_Random/Random_Binomial.f90
+0
-5
Src08/CFML_Random/Random_Cauchy.f90
Src08/CFML_Random/Random_Cauchy.f90
+0
-1
Src08/CFML_Random/Random_Gamma.f90
Src08/CFML_Random/Random_Gamma.f90
+0
-6
Src08/CFML_Random/Random_InvGauss.f90
Src08/CFML_Random/Random_InvGauss.f90
+0
-1
Src08/CFML_Random/Random_Normal.f90
Src08/CFML_Random/Random_Normal.f90
+0
-2
Src08/CFML_Random/Random_Poisson.f90
Src08/CFML_Random/Random_Poisson.f90
+0
-4
Src08/CFML_Random/Random_T.f90
Src08/CFML_Random/Random_T.f90
+0
-1
Src08/CFML_Random/Random_VonMises.f90
Src08/CFML_Random/Random_VonMises.f90
+0
-2
Src08/CFML_Rational.f90
Src08/CFML_Rational.f90
+0
-4
Src08/CFML_Rational/RAT_Equal_rational.f90
Src08/CFML_Rational/RAT_Equal_rational.f90
+0
-2
Src08/CFML_Rational/RAT_assignment.f90
Src08/CFML_Rational/RAT_assignment.f90
+0
-6
Src08/CFML_Rational/RAT_constructor.f90
Src08/CFML_Rational/RAT_constructor.f90
+0
-2
Src08/CFML_Rational/RAT_generic.f90
Src08/CFML_Rational/RAT_generic.f90
+0
-8
Src08/CFML_Rational/RAT_is_integer.f90
Src08/CFML_Rational/RAT_is_integer.f90
+0
-3
Src08/CFML_Rational/RAT_operator_add.f90
Src08/CFML_Rational/RAT_operator_add.f90
+0
-3
Src08/CFML_Rational/RAT_operator_divisor.f90
Src08/CFML_Rational/RAT_operator_divisor.f90
+0
-3
Src08/CFML_Rational/RAT_operator_eq.f90
Src08/CFML_Rational/RAT_operator_eq.f90
+0
-3
Src08/CFML_Rational/RAT_operator_ge.f90
Src08/CFML_Rational/RAT_operator_ge.f90
+0
-3
Src08/CFML_Rational/RAT_operator_gt.f90
Src08/CFML_Rational/RAT_operator_gt.f90
+0
-3
Src08/CFML_Rational/RAT_operator_le.f90
Src08/CFML_Rational/RAT_operator_le.f90
+0
-3
Src08/CFML_Rational/RAT_operator_lt.f90
Src08/CFML_Rational/RAT_operator_lt.f90
+0
-3
Src08/CFML_Rational/RAT_operator_minus.f90
Src08/CFML_Rational/RAT_operator_minus.f90
+0
-4
Src08/CFML_Rational/RAT_operator_multiply.f90
Src08/CFML_Rational/RAT_operator_multiply.f90
+0
-3
Src08/CFML_Rational/RAT_operator_neq.f90
Src08/CFML_Rational/RAT_operator_neq.f90
+0
-3
Src08/CFML_Rational/RAT_overloads.f90
Src08/CFML_Rational/RAT_overloads.f90
+0
-20
Src08/CFML_Rational/RAT_rowechelon.f90
Src08/CFML_Rational/RAT_rowechelon.f90
+0
-3
Src08/CFML_Reflections/Refl_Conditions.f90
Src08/CFML_Reflections/Refl_Conditions.f90
+0
-2
Src08/CFML_Reflections/Refl_Write_List.f90
Src08/CFML_Reflections/Refl_Write_List.f90
+0
-1
Src08/CFML_SXTAL_Geom/SXTAL_Angles.f90
Src08/CFML_SXTAL_Geom/SXTAL_Angles.f90
+1
-2
Src08/CFML_SXTAL_Geom/SXTAL_FlatCone.f90
Src08/CFML_SXTAL_Geom/SXTAL_FlatCone.f90
+1
-1
Src08/CFML_Strings.f90
Src08/CFML_Strings.f90
+0
-1
Src08/CFML_Strings/StringFullp.f90
Src08/CFML_Strings/StringFullp.f90
+0
-8
Src08/CFML_Strings/StringNum.f90
Src08/CFML_Strings/StringNum.f90
+0
-14
Src08/CFML_Strings/StringReadKey.f90
Src08/CFML_Strings/StringReadKey.f90
+0
-4
Src08/CFML_Strings/StringTools.f90
Src08/CFML_Strings/StringTools.f90
+1
-19
Src08/CFML_Tables/Tab_Del_BVST.f90
Src08/CFML_Tables/Tab_Del_BVST.f90
+0
-4
Src08/CFML_Tables/Tab_Del_BondsT.f90
Src08/CFML_Tables/Tab_Del_BondsT.f90
+0
-1
Src08/CFML_Tables/Tab_Del_ScatterT.f90
Src08/CFML_Tables/Tab_Del_ScatterT.f90
+0
-4
Src08/CFML_Tables/Tab_Get_BondsT.f90
Src08/CFML_Tables/Tab_Get_BondsT.f90
+0
-2
Src08/CFML_Tables/Tab_Get_ScatterT.f90
Src08/CFML_Tables/Tab_Get_ScatterT.f90
+0
-9
Src08/CFML_Tables/Tab_Read_MagneticDBase.f90
Src08/CFML_Tables/Tab_Read_MagneticDBase.f90
+60
-25
Src08/CFML_Tables/Tab_Read_SSG_DBase.f90
Src08/CFML_Tables/Tab_Read_SSG_DBase.f90
+4
-2
Src08/CFML_Tables/Tab_Set_BVST.f90
Src08/CFML_Tables/Tab_Set_BVST.f90
+0
-1
Src08/CFML_Tables/Tab_Set_BondsT.f90
Src08/CFML_Tables/Tab_Set_BondsT.f90
+0
-1
Src08/CFML_Tables/Tab_Set_ScatterT.f90
Src08/CFML_Tables/Tab_Set_ScatterT.f90
+4
-4
Src08/CFML_Tables/Tab_Set_SpgT.f90
Src08/CFML_Tables/Tab_Set_SpgT.f90
+19
-19
Src08/CFML_gSpaceGroups.f90
Src08/CFML_gSpaceGroups.f90
+9
-9
Src08/CFML_gSpaceGroups/gS_CheckGener.f90
Src08/CFML_gSpaceGroups/gS_CheckGener.f90
+0
-1
Src08/CFML_gSpaceGroups/gS_Get_Hall_Gener.f90
Src08/CFML_gSpaceGroups/gS_Get_Hall_Gener.f90
+394
-189
Src08/CFML_gSpaceGroups/gS_Get_Mat_Symb.f90
Src08/CFML_gSpaceGroups/gS_Get_Mat_Symb.f90
+2
-1
Src08/CFML_gSpaceGroups/gS_Get_OriginShift.f90
Src08/CFML_gSpaceGroups/gS_Get_OriginShift.f90
+0
-1
Src08/CFML_gSpaceGroups/gS_Get_SubGrp.f90
Src08/CFML_gSpaceGroups/gS_Get_SubGrp.f90
+127
-100
Src08/CFML_gSpaceGroups/gS_Identify_Groups.f90
Src08/CFML_gSpaceGroups/gS_Identify_Groups.f90
+0
-1
Src08/CFML_gSpaceGroups/gS_OnePrimeOp.f90
Src08/CFML_gSpaceGroups/gS_OnePrimeOp.f90
+1
-1
Src08/CFML_gSpaceGroups/gS_Set_SpaceG.f90
Src08/CFML_gSpaceGroups/gS_Set_SpaceG.f90
+20
-0
Src08/CFML_gSpaceGroups/gS_Symm_Symbols.f90
Src08/CFML_gSpaceGroups/gS_Symm_Symbols.f90
+0
-4
Src08/CMakeLists.txt
Src08/CMakeLists.txt
+8
-3
Src08/Header_CrysFML08.txt
Src08/Header_CrysFML08.txt
+7
-7
Src08/Testing/DataRed/twin_mod.f90
Src08/Testing/DataRed/twin_mod.f90
+1
-2
cmake/FindWINTERACTER.cmake
cmake/FindWINTERACTER.cmake
+33
-41
No files found.
Cmake_help.inf
View file @
1ada0c48
...
...
@@ -77,14 +77,14 @@ cmake -G "NMake Makefiles" -D GUI=ON -D ARCH32=OFF -D CMAKE_Fortran_COMPILER_FO
Building CrysFML08
==================
# Console Only for Ifort in debug mode
cmake -G "NMake Makefiles" -D ARCH32=OFF -D CMAKE_BUILD_TYPE=Debug -D CMAKE_Fortran_COMPILER=ifort -D CMAKE_INSTALL_PREFIX=%CRYSFML%\ifort64_debug -D CRYSFML_PREFIX=LibC08 -D CRYSFML08=ON ..\..\.
cmake -G "NMake Makefiles" -D ARCH32=OFF -D
PROG_EX=OFF -D
CMAKE_BUILD_TYPE=Debug -D CMAKE_Fortran_COMPILER=ifort -D CMAKE_INSTALL_PREFIX=%CRYSFML%\ifort64_debug -D CRYSFML_PREFIX=LibC08 -D CRYSFML08=ON ..\..\.
# Console Only for Ifort in release mode
cmake -G "NMake Makefiles" -D ARCH32=OFF GUI=OFF -D CMAKE_BUILD_TYPE=Release -D CMAKE_Fortran_COMPILER=ifort -D CMAKE_INSTALL_PREFIX=%CRYSFML%\ifort64 -D CRYSFML_PREFIX=LibC08 -D CRYSFML08=ON ..\..\.
cmake -G "NMake Makefiles" -D ARCH32=OFF
-D PROG_EX=OFF
GUI=OFF -D CMAKE_BUILD_TYPE=Release -D CMAKE_Fortran_COMPILER=ifort -D CMAKE_INSTALL_PREFIX=%CRYSFML%\ifort64 -D CRYSFML_PREFIX=LibC08 -D CRYSFML08=ON ..\..\.
# Console Only for gfortran in debug mode
cmake -G "MinGW Makefiles" -D ARCH32=OFF -D CMAKE_BUILD_TYPE=Debug -D CMAKE_Fortran_COMPILER=gfortran -D CMAKE_INSTALL_PREFIX=%CRYSFML%\gfortran_debug -D CRYSFML_PREFIX=LibC08 -D CRYSFML08=ON ..\..\.
cmake -G "MinGW Makefiles" -D ARCH32=OFF -D
PROG_EX=OFF -D
CMAKE_BUILD_TYPE=Debug -D CMAKE_Fortran_COMPILER=gfortran -D CMAKE_INSTALL_PREFIX=%CRYSFML%\gfortran_debug -D CRYSFML_PREFIX=LibC08 -D CRYSFML08=ON ..\..\.
# Console Only for gfortran in release mode
cmake -G "MinGW Makefiles" -D ARCH32=OFF GUI=OFF -D CMAKE_BUILD_TYPE=Release -D CMAKE_Fortran_COMPILER=gfortran -D CMAKE_INSTALL_PREFIX=%CRYSFML%\gfortran -D CRYSFML_PREFIX=LibC08 -D CRYSFML08=ON ..\..\.
cmake -G "MinGW Makefiles" -D ARCH32=OFF
-D PROG_EX=OFF
GUI=OFF -D CMAKE_BUILD_TYPE=Release -D CMAKE_Fortran_COMPILER=gfortran -D CMAKE_INSTALL_PREFIX=%CRYSFML%\gfortran -D CRYSFML_PREFIX=LibC08 -D CRYSFML08=ON ..\..\.
Building CrysFML for use with HDF5
...
...
Program_Examples/BondStr/Scripts/Windows/make_bondstr_ifort.bat
View file @
1ada0c48
...
...
@@ -3,8 +3,8 @@ rem
rem Intel Compilation
cd
%CRYSFML%
\Program_Examples\BondStr\Src
rem
ifort
Bond_Str
.f90
/c /O
3
/nologo /I
"
%CRYSFML%
"
\ifort\libc
ifort
/exe
:Bond
_Str
*
.obj
"
%CRYSFML%
"
\ifort\libc\crysfml.lib
ifort
Bond_Str
.f90
/c /O
3
/nologo /I
"
%CRYSFML%
"
\ifort
64
\libc
ifort
/exe
:Bond
_Str
*
.obj
"
%CRYSFML%
"
\ifort
64
\libc\crysfml.lib
rem
rem Compress executable
rem
...
...
Program_Examples/BondStr/Src/Bond_Str.f90
View file @
1ada0c48
...
...
@@ -477,7 +477,7 @@ Program Bond_Str
end
do
write
(
unit
=
lun
,
fmt
=
"(a)"
)
" "
end
if
do
n1
=
1
,
Ac
%
N_Cations
do
_n1
:
do
n1
=
1
,
Ac
%
N_Cations
do
j
=
1
,
Ac
%
N_Anions
n2
=
Ac
%
N_Cations
+
j
write
(
unit
=
lun
,
fmt
=
"(2(a,i3,a,a4),/,3(a,f9.5),/,3(a,f9.5),a)"
)
&
...
...
@@ -489,8 +489,14 @@ Program Bond_Str
write
(
unit
=
lun
,
fmt
=
"(2(a,a,a,f6.3,a),/)"
)
&
" Cation (Eff. radius): "
,
Ac
%
Species
(
n1
),
"("
,
Ac
%
Radius
(
n1
),
") "
,
&
" Anion (Eff. radius): "
,
Ac
%
Species
(
n2
),
"("
,
Ac
%
Radius
(
n2
),
")"
if
(
abs
(
Table_Dzero
(
n1
,
n2
))
<
0.0001
)
then
err_conf
=
.true.
write
(
unit
=
ERR_Conf_Mess
,
fmt
=
"(a)"
)
" => Bad parameters for "
//
Ac
%
Species
(
n1
)//
" with "
//
Ac
%
Species
(
n2
)//
&
" -> Use the instruction: BVELPAR Cation Anion Nc R0 Cutoff D0 Rmin alpha"
exit
do_n1
end
if
end
do
end
do
end
do
do_n1
end
if
else
! Setting Tables for B and D0
...
...
Src/CFML_Conf_Calc.f90
View file @
1ada0c48
...
...
@@ -2636,6 +2636,10 @@
call
Deallocate_BVEL_Table
()
end
if
if
(
present
(
N_Bvel
))
then
call
Complete_Table_BVEL
(
A
,
N_bvel
,
bvel
)
end
if
return
End
Subroutine
Set_Table_BVEL_Params
...
...
Src08/CFML_DiffPatt/DiffP_ReadPatterns.f90
View file @
1ada0c48
...
...
@@ -49,7 +49,6 @@ SubModule (CFML_DiffPatt) RPatt
end
if
return
End
Subroutine
Read_Pattern_Mult
!!--++
...
...
Src08/CFML_Diffpatt.f90
View file @
1ada0c48
...
...
@@ -426,7 +426,6 @@
Pat
%
gbgr
=
.false.
end
select
return
End
Subroutine
Allocate_Pattern
!!----
...
...
Src08/CFML_EnBVS/EnBVS_CostF.f90
View file @
1ada0c48
...
...
@@ -25,7 +25,6 @@
bv
=
EXP
((
d0
-
d
)/
b0
)
sbv
=
bv
*
sd
/
b0
return
End
Subroutine
Bond_Valence
!!----
...
...
Src08/CFML_EnBVS/EnBVS_SetTab.f90
View file @
1ada0c48
...
...
@@ -57,7 +57,6 @@
call
init_atom_type
(
A
%
atom
(
i
),
0
)
end
do
return
End
Subroutine
Allocate_Atoms_Conf_List
!!----
...
...
Src08/CFML_ExtinCorr.f90
View file @
1ada0c48
...
...
@@ -117,7 +117,6 @@ Module CFML_ExtinCorr
ag
=
0.58_cp
+
(
0.48_cp
+
0.24_cp
*
cos2t
)
*
cos2t
return
End
Function
AG_theta
!!----
...
...
@@ -132,7 +131,6 @@ Module CFML_ExtinCorr
al
=
0.025_cp
+
0.285_cp
*
cos2t
return
End
Function
AL_theta
!!----
...
...
@@ -147,7 +145,6 @@ Module CFML_ExtinCorr
bg
=
0.02_cp
-
0.025_cp
*
cos2t
return
End
Function
BG_theta
!!----
...
...
@@ -165,7 +162,6 @@ Module CFML_ExtinCorr
bl
=
-0.45_cp
*
cos2t
end
if
return
End
Function
BL_theta
End
Module
CFML_ExtinCorr
\ No newline at end of file
Src08/CFML_FFT.f90
View file @
1ada0c48
This diff is collapsed.
Click to expand it.
Src08/CFML_FFT/FFT_Convol.f90
View file @
1ada0c48
...
...
@@ -146,7 +146,6 @@ SubModule (CFML_FFT) FFT_Convol
fft
(
i
)
=
cmplx
(
x
(
i
),
y
(
i
))
end
do
return
End
Function
F_FFT
!!----
...
...
@@ -693,7 +692,6 @@ SubModule (CFML_FFT) FFT_Convol
end
do
end
do
return
End
Subroutine
HFFT
!!----
...
...
@@ -854,7 +852,6 @@ SubModule (CFML_FFT) FFT_Convol
Array
(
i
)
=
cmplx
(
x
(
i
),
y
(
i
))
end
do
return
End
Subroutine
SFFT
End
SubModule
FFT_Convol
Src08/CFML_FFT/FFT_Gen.f90
View file @
1ada0c48
...
...
@@ -29,7 +29,6 @@ Submodule (CFML_FFT) FFTGen
Err_CFML
%
Msg
=
"FFT1D@CFML_FFT: Error in FFT!"
end
if
return
End
Function
Fft1D
!!--++
...
...
@@ -65,7 +64,6 @@ Submodule (CFML_FFT) FFTGen
Err_CFML
%
Msg
=
"FFT2D@CFML_FFT: Error in FFT!"
end
if
return
End
Function
Fft2D
!!--++
...
...
@@ -102,7 +100,6 @@ Submodule (CFML_FFT) FFTGen
Err_CFML
%
Msg
=
"FFT3D@CFML_FFT: Error in FFT!"
end
if
return
End
Function
Fft3D
!!--++
...
...
@@ -139,7 +136,6 @@ Submodule (CFML_FFT) FFTGen
Err_CFML
%
Msg
=
"FFT4D@CFML_FFT: Error in FFT!"
end
if
return
End
Function
Fft4D
!!--++
...
...
@@ -179,7 +175,6 @@ Submodule (CFML_FFT) FFTGen
Err_CFML
%
Msg
=
"FFT5D@CFML_FFT: Error in FFT!"
end
if
return
End
Function
Fft5D
!!--++
...
...
@@ -218,7 +213,6 @@ Submodule (CFML_FFT) FFTGen
Err_CFML
%
Msg
=
"FFT6D@CFML_FFT: Error in FFT!"
end
if
return
End
Function
Fft6D
!!--++
...
...
@@ -257,7 +251,6 @@ Submodule (CFML_FFT) FFTGen
Err_CFML
%
Msg
=
"FFT7D@CFML_FFT: Error in FFT!"
end
if
return
End
Function
Fft7D
!!--++
...
...
@@ -306,7 +299,6 @@ Submodule (CFML_FFT) FFTGen
end
if
end
do
return
End
Subroutine
Fftn
End
SubModule
FFTGen
Src08/CFML_Geom/Geom_Allocations.f90
View file @
1ada0c48
...
...
@@ -56,7 +56,6 @@
Coord_Info
%
S_Dist
=
0.0
Coord_Info
%
Tr_Coo
=
0.0
return
End
Subroutine
Allocate_Coordination_Type
!!----
...
...
@@ -112,7 +111,6 @@
Coord_Info
%
Natoms
=
0
Coord_Info
%
Max_Coor
=
0
return
End
Subroutine
Deallocate_Coordination_Type
!!----
...
...
@@ -131,7 +129,6 @@
if
(
allocated
(
pl
%
p
)
)
deallocate
(
pl
%
p
)
if
(
allocated
(
pl
%
x
)
)
deallocate
(
pl
%
x
)
return
End
Subroutine
Deallocate_Point_List
...
...
Src08/CFML_Geom/Geom_Angles.f90
View file @
1ada0c48
...
...
@@ -328,7 +328,6 @@
R
(
3
,
1
)
-
R
(
1
,
3
),
&
R
(
1
,
2
)
-
R
(
2
,
1
)
/)
end
if
return
End
Subroutine
Get_Anglen_Axis_From_RotMat
!!----
...
...
@@ -642,7 +641,6 @@
s
=
sqrt
(
s1
+
s2
+
s3
+
s4
)
*
to_deg
tor
=
tau
return
End
Subroutine
Torsion_and_Sigma
End
SubModule
Angle_calculations
Src08/CFML_Geom/Geom_Distances.f90
View file @
1ada0c48
...
...
@@ -312,7 +312,6 @@
end
do
!j
end
do
!i
return
End
Subroutine
Calc_Dist_Angle
!!----
...
...
@@ -1046,7 +1045,6 @@
end
do
s
=
sqrt
(
s
)/
dis
return
End
Subroutine
Distance_and_Sigma
!!----
...
...
@@ -1176,7 +1174,6 @@
write
(
unit
=
lun
,
fmt
=
"(a,/,/,/)"
)
end
if
return
End
Subroutine
P1_Dist
!!----
...
...
Src08/CFML_Geom/Geom_Matrices.f90
View file @
1ada0c48
...
...
@@ -69,7 +69,6 @@
Mt
(
2
,
3
)
=
sin
(
p
)
*
sin
(
t
)
! w
Mt
(
3
,
3
)
=
cos
(
t
)
!
return
End
Function
Matrix_Phithechi
!!----
...
...
@@ -117,7 +116,6 @@
Mt
(
2
,
3
)
=-
sin
(
p
)
! w
Mt
(
3
,
3
)
=
cos
(
p
)
!
return
End
Function
Matrix_Rx
!!----
...
...
@@ -165,7 +163,6 @@
Mt
(
2
,
3
)
=
0.0
! w
Mt
(
3
,
3
)
=
cos
(
p
)
!
return
End
Function
Matrix_Ry
!!----
...
...
@@ -213,7 +210,6 @@
Mt
(
2
,
3
)
=
0.0
! w
Mt
(
3
,
3
)
=
1.0
!
return
End
Function
Matrix_Rz
!!---- Pure Module Function Set_Rotation_Matrix(ang) Result(Rot)
...
...
@@ -308,7 +304,6 @@
if
(
present
(
ang
))
ang
=
phi
if
(
present
(
w
))
w
=
vu
end
if
return
End
Subroutine
Get_Matrix_moving_v_to_u
End
Submodule
Matrices
\ No newline at end of file
Src08/CFML_Geom/Geom_Orbits.f90
View file @
1ada0c48
...
...
@@ -279,7 +279,6 @@
end
do
if
(
allocated
(
A
%
atom
))
deallocate
(
A
%
atom
)
if
(
present
(
debug
))
close
(
unit
=
lu
)
return
End
Subroutine
Set_New_AsymUnit
...
...
@@ -323,7 +322,6 @@
end
if
end
do
return
End
Subroutine
Set_Orbits_Inlist
End
Submodule
Orbits
Src08/CFML_GlobalDeps_Linux_GFOR.f90
View file @
1ada0c48
...
...
@@ -6,17 +6,17 @@
!!---- in military applications.
!!----
!!---- Copyright (C) 1999-2020
!!----
!!----
!!---- Institutions:
!!---- Institut Laue-Langevin (ILL), Grenoble, FRANCE
!!---- Universidad de La Laguna (ULL), Tenerife, SPAIN
!!---- Laboratoire Leon Brillouin(LLB), Saclay, FRANCE
!!----
!!---- Authors:
!!---- Authors:
!!---- Juan Rodriguez-Carvajal (ILL)
!!---- Javier Gonzalez-Platas (ULL)
!!----
!!---- Contributors:
!!---- Contributors:
!!---- Laurent Chapon (ILL)
!!---- Marc Janoschek (Los Alamos National Laboratory, USA)
!!---- Oksana Zaharko (Paul Scherrer Institute, Switzerland)
...
...
@@ -24,23 +24,23 @@
!!---- Eric Pellegrini (ILL)
!!---- Ross J. Angel (University of Pavia)
!!----
!!---- This library is free software; you can redistribute it and/or modify
!!---- it under the terms of the GNU Lesser General Public License as
!!---- published by the Free Software Foundation; either version 3.0 of the
!!---- This library is free software; you can redistribute it and/or modify
!!---- it under the terms of the GNU Lesser General Public License as
!!---- published by the Free Software Foundation; either version 3.0 of the
!!---- License, or (at your option) any later version.
!!----
!!---- This library is distributed in the hope that it will be useful, but
!!---- WITHOUT ANY WARRANTY; without even the implied warranty of
!!---- WITHOUT ANY WARRANTY; without even the implied warranty of
!!---- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
!!---- Lesser General Public License for more details.
!!----
!!---- You should have received a copy of the GNU Lesser General Public
!!---- License along with this library; if not, see
!!---- License along with this library; if not, see
!!---- <http://www.gnu.org/licenses/>.
!!----
!!---- MODULE: CFML_GlobalDeps (Windows version)
!!---- INFO:Precision for CrysFML library and Operating System information
!!---- All the global variables defined in this module are implicitly
!!---- All the global variables defined in this module are implicitly
!!---- public.
!!----
!!----
...
...
@@ -137,7 +137,6 @@ Module CFML_GlobalDeps
inquire
(
file
=
trim
(
linea
)//
'.'
,
exist
=
info
)
end
select
return
End
Function
Directory_Exists
!!----
...
...
@@ -153,7 +152,6 @@ Module CFML_GlobalDeps
Err_CFML
%
nl
=
0
Err_CFML
%
Txt
=
" "
return
End
Subroutine
Clear_Error
!!----
...
...
@@ -168,7 +166,6 @@ Module CFML_GlobalDeps
CFML_DEBUG
=
state
return
End
Subroutine
Set_CFML_DEBUG
End
Module
CFML_GlobalDeps
Src08/CFML_GlobalDeps_Linux_IFOR.f90
View file @
1ada0c48
...
...
@@ -6,17 +6,17 @@
!!---- in military applications.
!!----
!!---- Copyright (C) 1999-2020
!!----
!!----
!!---- Institutions:
!!---- Institut Laue-Langevin (ILL), Grenoble, FRANCE
!!---- Universidad de La Laguna (ULL), Tenerife, SPAIN
!!---- Laboratoire Leon Brillouin(LLB), Saclay, FRANCE
!!----
!!---- Authors:
!!---- Authors:
!!---- Juan Rodriguez-Carvajal (ILL)
!!---- Javier Gonzalez-Platas (ULL)
!!----
!!---- Contributors:
!!---- Contributors:
!!---- Laurent Chapon (ILL)
!!---- Marc Janoschek (Los Alamos National Laboratory, USA)
!!---- Oksana Zaharko (Paul Scherrer Institute, Switzerland)
...
...
@@ -24,23 +24,23 @@
!!---- Eric Pellegrini (ILL)
!!---- Ross J. Angel (University of Pavia)
!!----
!!---- This library is free software; you can redistribute it and/or modify
!!---- it under the terms of the GNU Lesser General Public License as
!!---- published by the Free Software Foundation; either version 3.0 of the
!!---- This library is free software; you can redistribute it and/or modify
!!---- it under the terms of the GNU Lesser General Public License as
!!---- published by the Free Software Foundation; either version 3.0 of the
!!---- License, or (at your option) any later version.
!!----
!!---- This library is distributed in the hope that it will be useful, but
!!---- WITHOUT ANY WARRANTY; without even the implied warranty of
!!---- WITHOUT ANY WARRANTY; without even the implied warranty of
!!---- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
!!---- Lesser General Public License for more details.
!!----
!!---- You should have received a copy of the GNU Lesser General Public
!!---- License along with this library; if not, see
!!---- License along with this library; if not, see
!!---- <http://www.gnu.org/licenses/>.
!!----
!!---- MODULE: CFML_GlobalDeps (Windows version)
!!---- INFO:Precision for CrysFML library and Operating System information
!!---- All the global variables defined in this module are implicitly
!!---- All the global variables defined in this module are implicitly
!!---- public.
!!----
!!----
...
...
@@ -141,7 +141,6 @@ Module CFML_GlobalDeps
inquire
(
file
=
trim
(
linea
)//
'.'
,
exist
=
info
)
end
select
return
End
Function
Directory_Exists
!!----
...
...
@@ -157,7 +156,6 @@ Module CFML_GlobalDeps
Err_CFML
%
nl
=
0
Err_CFML
%
Txt
=
" "
return
End
Subroutine
Clear_Error
!!----
...
...
@@ -172,7 +170,6 @@ Module CFML_GlobalDeps
CFML_DEBUG
=
state
return
End
Subroutine
Set_CFML_DEBUG
End
Module
CFML_GlobalDeps
Src08/CFML_GlobalDeps_MacOS_GFOR.f90
View file @
1ada0c48
...
...
@@ -6,17 +6,17 @@
!!---- in military applications.
!!----
!!---- Copyright (C) 1999-2020
!!----
!!----
!!---- Institutions:
!!---- Institut Laue-Langevin (ILL), Grenoble, FRANCE
!!---- Universidad de La Laguna (ULL), Tenerife, SPAIN
!!---- Laboratoire Leon Brillouin(LLB), Saclay, FRANCE
!!----
!!---- Authors:
!!---- Authors:
!!---- Juan Rodriguez-Carvajal (ILL)
!!---- Javier Gonzalez-Platas (ULL)
!!----
!!---- Contributors:
!!---- Contributors:
!!---- Laurent Chapon (ILL)
!!---- Marc Janoschek (Los Alamos National Laboratory, USA)
!!---- Oksana Zaharko (Paul Scherrer Institute, Switzerland)
...
...
@@ -24,23 +24,23 @@
!!---- Eric Pellegrini (ILL)
!!---- Ross J. Angel (University of Pavia)
!!----
!!---- This library is free software; you can redistribute it and/or modify
!!---- it under the terms of the GNU Lesser General Public License as
!!---- published by the Free Software Foundation; either version 3.0 of the
!!---- This library is free software; you can redistribute it and/or modify
!!---- it under the terms of the GNU Lesser General Public License as
!!---- published by the Free Software Foundation; either version 3.0 of the
!!---- License, or (at your option) any later version.
!!----
!!---- This library is distributed in the hope that it will be useful, but
!!---- WITHOUT ANY WARRANTY; without even the implied warranty of
!!---- WITHOUT ANY WARRANTY; without even the implied warranty of
!!---- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
!!---- Lesser General Public License for more details.
!!----
!!---- You should have received a copy of the GNU Lesser General Public
!!---- License along with this library; if not, see
!!---- License along with this library; if not, see
!!---- <http://www.gnu.org/licenses/>.
!!----
!!---- MODULE: CFML_GlobalDeps (Windows version)
!!---- INFO:Precision for CrysFML library and Operating System information
!!---- All the global variables defined in this module are implicitly
!!---- All the global variables defined in this module are implicitly
!!---- public.
!!----
!!----
...
...
@@ -137,7 +137,6 @@ Module CFML_GlobalDeps
inquire
(
file
=
trim
(
linea
)//
'.'
,
exist
=
info
)
end
select
return
End
Function
Directory_Exists
!!----
...
...
@@ -153,7 +152,6 @@ Module CFML_GlobalDeps
Err_CFML
%
nl
=
0
Err_CFML
%
Txt
=
" "
return
End
Subroutine
Clear_Error
!!----
...
...
@@ -168,7 +166,6 @@ Module CFML_GlobalDeps
CFML_DEBUG
=
state
return
End
Subroutine
Set_CFML_DEBUG
End
Module
CFML_GlobalDeps
Src08/CFML_GlobalDeps_MacOs_IFOR.f90
View file @
1ada0c48
...
...
@@ -6,17 +6,17 @@
!!---- in military applications.
!!----
!!---- Copyright (C) 1999-2020
!!----
!!----
!!---- Institutions:
!!---- Institut Laue-Langevin (ILL), Grenoble, FRANCE
!!---- Universidad de La Laguna (ULL), Tenerife, SPAIN
!!---- Laboratoire Leon Brillouin(LLB), Saclay, FRANCE
!!----
!!---- Authors:
!!---- Authors:
!!---- Juan Rodriguez-Carvajal (ILL)
!!---- Javier Gonzalez-Platas (ULL)
!!----
!!---- Contributors:
!!---- Contributors:
!!---- Laurent Chapon (ILL)
!!---- Marc Janoschek (Los Alamos National Laboratory, USA)
!!---- Oksana Zaharko (Paul Scherrer Institute, Switzerland)
...
...
@@ -24,24 +24,24 @@
!!---- Eric Pellegrini (ILL)
!!---- Ross J. Angel (University of Pavia)
!!----
!!---- This library is free software; you can redistribute it and/or modify
!!---- it under the terms of the GNU Lesser General Public License as
!!---- published by the Free Software Foundation; either version 3.0 of the
!!---- This library is free software; you can redistribute it and/or modify
!!---- it under the terms of the GNU Lesser General Public License as
!!---- published by the Free Software Foundation; either version 3.0 of the
!!---- License, or (at your option) any later version.
!!----
!!---- This library is distributed in the hope that it will be useful, but
!!---- WITHOUT ANY WARRANTY; without even the implied warranty of