Skip to content

Commit 71d5a56

Browse files
cmbantcmbant
committed
Jan 2015 version changes, inc BKP likelihood
1 parent 104c69c commit 71d5a56

File tree

401 files changed

+33904
-24897
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

401 files changed

+33904
-24897
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,4 @@ Release/
2323
data/clik
2424
cosmomc
2525
cosmomc_debug
26-
getdist
2726
CosmoMC/

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ cosmomc_debug: BUILD ?= MPI
66
getdist: ./source/*.*90
77
cd ./source && make getdist BUILD=$(BUILD)
88

9-
cosmomc: ./source/*.*90
9+
cosmomc: ./source/*.*90 ./camb/*.*90
1010
cd ./source && make cosmomc BUILD=$(BUILD)
1111

12-
cosmomc_debug: ./source/*.*90
12+
cosmomc_debug: ./source/*.*90 ./camb/*.*90
1313
cd ./source && make cosmomc_debug OUTPUT_DIR=Debug BUILD=$(BUILD)
1414

15-
camspec: ./source/*.*90
15+
camspec: ./source/*.*90 ./camb/*.*90
1616
cd ./source && make highL=../highL PLANCKLIKE=cliklike_CamSpec
1717

1818
clean:

‎VisualStudio/CosmoMC.sln

+4-86
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,60 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2010
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.31101.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "CosmoMC", "CosmoMC.vfproj", "{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}"
57
ProjectSection(ProjectDependencies) = postProject
68
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53} = {30BB4525-ADB5-4FD8-B169-4E5FCD579B53}
7-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32} = {F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}
8-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25} = {9A850B68-FC7B-42F7-BB78-C4C38EF90B25}
99
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95} = {C7D790F6-3574-43A1-A5E1-1E6FC5478F95}
1010
EndProjectSection
1111
EndProject
12-
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "SharedObj", "..\camb\VisualStudio\SharedObj.vfproj", "{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}"
13-
EndProject
1412
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "CAMBLib_ppf", "..\camb\VisualStudio\CAMBLib_ppf.vfproj", "{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}"
15-
ProjectSection(ProjectDependencies) = postProject
16-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32} = {F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}
17-
EndProjectSection
1813
EndProject
1914
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "CosmoMC_lib", "CosmoMC_lib.vfproj", "{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}"
2015
ProjectSection(ProjectDependencies) = postProject
21-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32} = {F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}
22-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25} = {9A850B68-FC7B-42F7-BB78-C4C38EF90B25}
2316
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95} = {C7D790F6-3574-43A1-A5E1-1E6FC5478F95}
2417
EndProjectSection
2518
EndProject
2619
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "GetDist", "GetDist.vfproj", "{6A7128DC-E860-435A-A40D-674E5B2AC165}"
2720
EndProject
28-
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "MatrixDouble", "..\camb\VisualStudio\MatrixDouble.vfproj", "{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}"
29-
ProjectSection(ProjectDependencies) = postProject
30-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32} = {F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}
31-
EndProjectSection
32-
EndProject
33-
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "tests", "tests.vfproj", "{E4DB04A5-F3D2-4B40-9002-B5B656E38FFE}"
34-
ProjectSection(ProjectDependencies) = postProject
35-
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53} = {30BB4525-ADB5-4FD8-B169-4E5FCD579B53}
36-
EndProjectSection
37-
EndProject
3821
Global
3922
GlobalSection(SolutionConfigurationPlatforms) = preSolution
40-
Debug|Win32 = Debug|Win32
4123
Debug|x64 = Debug|x64
42-
DebugMPI|Win32 = DebugMPI|Win32
4324
DebugMPI|x64 = DebugMPI|x64
44-
PICO|Win32 = PICO|Win32
4525
PICO|x64 = PICO|x64
46-
Release|Win32 = Release|Win32
4726
Release|x64 = Release|x64
4827
EndGlobalSection
4928
GlobalSection(ProjectConfigurationPlatforms) = postSolution
50-
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.Debug|Win32.ActiveCfg = Debug|Win32
51-
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.Debug|Win32.Build.0 = Debug|Win32
5229
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.Debug|x64.ActiveCfg = Debug|x64
5330
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.Debug|x64.Build.0 = Debug|x64
54-
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.DebugMPI|Win32.ActiveCfg = DebugMPI|Win32
55-
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.DebugMPI|Win32.Build.0 = DebugMPI|Win32
5631
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.DebugMPI|x64.ActiveCfg = DebugMPI|x64
5732
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.DebugMPI|x64.Build.0 = DebugMPI|x64
58-
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.PICO|Win32.ActiveCfg = PICO|Win32
59-
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.PICO|Win32.Build.0 = PICO|Win32
6033
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.PICO|x64.ActiveCfg = PICO|x64
6134
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.PICO|x64.Build.0 = PICO|x64
62-
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.Release|Win32.ActiveCfg = Release|Win32
63-
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.Release|Win32.Build.0 = Release|Win32
6435
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.Release|x64.ActiveCfg = Release|x64
6536
{207BF71A-E457-49F3-BEC8-B2F9E85F74BA}.Release|x64.Build.0 = Release|x64
66-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.Debug|Win32.ActiveCfg = Debug|Win32
67-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.Debug|Win32.Build.0 = Debug|Win32
68-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.Debug|x64.ActiveCfg = Debug|x64
69-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.DebugMPI|Win32.ActiveCfg = DebugMPI|Win32
70-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.DebugMPI|Win32.Build.0 = DebugMPI|Win32
71-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.DebugMPI|x64.ActiveCfg = Debug|x64
72-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.PICO|Win32.ActiveCfg = DebugMPI|Win32
73-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.PICO|x64.ActiveCfg = Release|x64
74-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.PICO|x64.Build.0 = Release|x64
75-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.Release|Win32.ActiveCfg = Release|Win32
76-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.Release|Win32.Build.0 = Release|Win32
77-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.Release|x64.ActiveCfg = Release|x64
78-
{F371D52E-C2C8-4F56-83D2-4ED9E26F5F32}.Release|x64.Build.0 = Release|x64
79-
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.Debug|Win32.ActiveCfg = Debug|Win32
80-
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.Debug|Win32.Build.0 = Debug|Win32
8137
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.Debug|x64.ActiveCfg = Debug|x64
82-
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.DebugMPI|Win32.ActiveCfg = DebugMPI|Win32
83-
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.DebugMPI|Win32.Build.0 = DebugMPI|Win32
38+
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.Debug|x64.Build.0 = Debug|x64
8439
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.DebugMPI|x64.ActiveCfg = Debug|x64
85-
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.PICO|Win32.ActiveCfg = DebugMPI|Win32
8640
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.PICO|x64.ActiveCfg = Release|x64
8741
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.PICO|x64.Build.0 = Release|x64
88-
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.Release|Win32.ActiveCfg = Release|Win32
89-
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.Release|Win32.Build.0 = Release|Win32
9042
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.Release|x64.ActiveCfg = Release|x64
9143
{C7D790F6-3574-43A1-A5E1-1E6FC5478F95}.Release|x64.Build.0 = Release|x64
92-
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.Debug|Win32.ActiveCfg = Debug|Win32
93-
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.Debug|Win32.Build.0 = Debug|Win32
9444
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.Debug|x64.ActiveCfg = Debug|x64
9545
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.Debug|x64.Build.0 = Debug|x64
96-
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.DebugMPI|Win32.ActiveCfg = DebugMPI|Win32
97-
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.DebugMPI|Win32.Build.0 = DebugMPI|Win32
9846
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.DebugMPI|x64.ActiveCfg = DebugMPI|x64
9947
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.DebugMPI|x64.Build.0 = DebugMPI|x64
100-
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.PICO|Win32.ActiveCfg = PICO|Win32
10148
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.PICO|x64.ActiveCfg = PICO|x64
10249
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.PICO|x64.Build.0 = PICO|x64
103-
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.Release|Win32.ActiveCfg = Release|Win32
104-
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.Release|Win32.Build.0 = Release|Win32
10550
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.Release|x64.ActiveCfg = Release|x64
10651
{30BB4525-ADB5-4FD8-B169-4E5FCD579B53}.Release|x64.Build.0 = Release|x64
107-
{6A7128DC-E860-435A-A40D-674E5B2AC165}.Debug|Win32.ActiveCfg = Debug|Win32
10852
{6A7128DC-E860-435A-A40D-674E5B2AC165}.Debug|x64.ActiveCfg = Debug|x64
109-
{6A7128DC-E860-435A-A40D-674E5B2AC165}.DebugMPI|Win32.ActiveCfg = Debug|x64
11053
{6A7128DC-E860-435A-A40D-674E5B2AC165}.DebugMPI|x64.ActiveCfg = Debug|x64
11154
{6A7128DC-E860-435A-A40D-674E5B2AC165}.DebugMPI|x64.Build.0 = Debug|x64
112-
{6A7128DC-E860-435A-A40D-674E5B2AC165}.PICO|Win32.ActiveCfg = Release|x64
11355
{6A7128DC-E860-435A-A40D-674E5B2AC165}.PICO|x64.ActiveCfg = Release|x64
114-
{6A7128DC-E860-435A-A40D-674E5B2AC165}.Release|Win32.ActiveCfg = Release|Win32
11556
{6A7128DC-E860-435A-A40D-674E5B2AC165}.Release|x64.ActiveCfg = Release|x64
11657
{6A7128DC-E860-435A-A40D-674E5B2AC165}.Release|x64.Build.0 = Release|x64
117-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.Debug|Win32.ActiveCfg = Debug|Win32
118-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.Debug|Win32.Build.0 = Debug|Win32
119-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.Debug|x64.ActiveCfg = Debug|x64
120-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.DebugMPI|Win32.ActiveCfg = DebugMPI|Win32
121-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.DebugMPI|Win32.Build.0 = DebugMPI|Win32
122-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.DebugMPI|x64.ActiveCfg = Debug|x64
123-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.PICO|Win32.ActiveCfg = DebugMPI|Win32
124-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.PICO|x64.ActiveCfg = Release|x64
125-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.PICO|x64.Build.0 = Release|x64
126-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.Release|Win32.ActiveCfg = Release|Win32
127-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.Release|Win32.Build.0 = Release|Win32
128-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.Release|x64.ActiveCfg = Release|x64
129-
{9A850B68-FC7B-42F7-BB78-C4C38EF90B25}.Release|x64.Build.0 = Release|x64
130-
{E4DB04A5-F3D2-4B40-9002-B5B656E38FFE}.Debug|Win32.ActiveCfg = Debug|Win32
131-
{E4DB04A5-F3D2-4B40-9002-B5B656E38FFE}.Debug|x64.ActiveCfg = Debug|x64
132-
{E4DB04A5-F3D2-4B40-9002-B5B656E38FFE}.Debug|x64.Build.0 = Debug|x64
133-
{E4DB04A5-F3D2-4B40-9002-B5B656E38FFE}.DebugMPI|Win32.ActiveCfg = DebugMPI|Win32
134-
{E4DB04A5-F3D2-4B40-9002-B5B656E38FFE}.DebugMPI|x64.ActiveCfg = Debug|x64
135-
{E4DB04A5-F3D2-4B40-9002-B5B656E38FFE}.PICO|Win32.ActiveCfg = DebugMPI|x64
136-
{E4DB04A5-F3D2-4B40-9002-B5B656E38FFE}.PICO|x64.ActiveCfg = Release|x64
137-
{E4DB04A5-F3D2-4B40-9002-B5B656E38FFE}.Release|Win32.ActiveCfg = Release|Win32
138-
{E4DB04A5-F3D2-4B40-9002-B5B656E38FFE}.Release|x64.ActiveCfg = Release|x64
139-
{E4DB04A5-F3D2-4B40-9002-B5B656E38FFE}.Release|x64.Build.0 = Release|x64
14058
EndGlobalSection
14159
GlobalSection(SolutionProperties) = preSolution
14260
HideSolutionNode = FALSE

‎VisualStudio/CosmoMC_lib.vfproj

+15-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Platform Name="x64"/></Platforms>
66
<Configurations>
77
<Configuration Name="Debug|x64" ConfigurationType="typeStaticLibrary">
8-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" PreprocessorDefinitions="NOWMAP" F2003Semantics="true" ErrorLimit="5" StandardWarnings="standardWarningsF08" WarnDeclarations="true" WarnTruncateSource="true" Traceback="true" BoundsCheck="true" UninitializedVariablesCheck="true" DescriptorDataTypeCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
8+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" F2003Semantics="true" ErrorLimit="5" StandardWarnings="standardWarningsF08" WarnDeclarations="true" WarnTruncateSource="true" FloatingPointExceptionHandling="fpe0" Traceback="true" BoundsCheck="true" UninitializedVariablesCheck="true" DescriptorDataTypeCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
99
<Tool Name="VFLibrarianTool"/>
1010
<Tool Name="VFResourceCompilerTool"/>
1111
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
@@ -14,7 +14,7 @@
1414
<Tool Name="VFPreBuildEventTool"/>
1515
<Tool Name="VFPostBuildEventTool"/></Configuration>
1616
<Configuration Name="Release|x64" ConfigurationType="typeStaticLibrary">
17-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" PreprocessorDefinitions="NOWMAP" OpenMP="OpenMPParallelCode" WarnUnusedVariables="true" WarnTruncateSource="true"/>
17+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" OpenMP="OpenMPParallelCode" WarnTruncateSource="true"/>
1818
<Tool Name="VFLibrarianTool"/>
1919
<Tool Name="VFResourceCompilerTool"/>
2020
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
@@ -23,7 +23,7 @@
2323
<Tool Name="VFPreBuildEventTool"/>
2424
<Tool Name="VFPostBuildEventTool"/></Configuration>
2525
<Configuration Name="DebugMPI|x64" ConfigurationType="typeStaticLibrary">
26-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" PreprocessorDefinitions="NOWMAP;MPI" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
26+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" PreprocessorDefinitions="MPI" StandardWarnings="standardWarningsF08" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
2727
<Tool Name="VFLibrarianTool"/>
2828
<Tool Name="VFResourceCompilerTool"/>
2929
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
@@ -32,7 +32,7 @@
3232
<Tool Name="VFPreBuildEventTool"/>
3333
<Tool Name="VFPostBuildEventTool"/></Configuration>
3434
<Configuration Name="PICO|x64" ConfigurationType="typeStaticLibrary">
35-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" PreprocessorDefinitions="PICO" OpenMP="OpenMPParallelCode"/>
35+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" PreprocessorDefinitions="PICO" OpenMP="OpenMPParallelCode" StandardWarnings="standardWarningsF08"/>
3636
<Tool Name="VFLibrarianTool" AdditionalLibraryDirectories="C:\WorkProgs\Python27\Lib\site-packages\pypico" AdditionalDependencies="pico.lib"/>
3737
<Tool Name="VFResourceCompilerTool"/>
3838
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
@@ -50,7 +50,7 @@
5050
<Tool Name="VFPreBuildEventTool"/>
5151
<Tool Name="VFPostBuildEventTool"/></Configuration>
5252
<Configuration Name="Release|Win32" ConfigurationType="typeStaticLibrary">
53-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" PreprocessorDefinitions="NOWMAP" OpenMP="OpenMPParallelCode"/>
53+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" PreprocessorDefinitions="NOWMAP" OpenMP="OpenMPParallelCode" StandardWarnings="standardWarningsF08"/>
5454
<Tool Name="VFLibrarianTool"/>
5555
<Tool Name="VFResourceCompilerTool"/>
5656
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
@@ -59,7 +59,7 @@
5959
<Tool Name="VFPreBuildEventTool"/>
6060
<Tool Name="VFPostBuildEventTool"/></Configuration>
6161
<Configuration Name="DebugMPI|Win32" ConfigurationType="typeStaticLibrary">
62-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" PreprocessorDefinitions="NOWMAP;MPI" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
62+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" PreprocessorDefinitions="NOWMAP;MPI" StandardWarnings="standardWarningsF08" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug"/>
6363
<Tool Name="VFLibrarianTool"/>
6464
<Tool Name="VFResourceCompilerTool"/>
6565
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
@@ -68,7 +68,7 @@
6868
<Tool Name="VFPreBuildEventTool"/>
6969
<Tool Name="VFPostBuildEventTool"/></Configuration>
7070
<Configuration Name="PICO|Win32" ConfigurationType="typeStaticLibrary">
71-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" PreprocessorDefinitions="PICO" OpenMP="OpenMPParallelCode"/>
71+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" HeapArrays="0" Preprocess="preprocessYes" PreprocessorDefinitions="PICO" OpenMP="OpenMPParallelCode" StandardWarnings="standardWarningsF08"/>
7272
<Tool Name="VFLibrarianTool" AdditionalLibraryDirectories="C:\WorkProgs\Python27\Lib\site-packages\pypico" AdditionalDependencies="pico.lib"/>
7373
<Tool Name="VFResourceCompilerTool"/>
7474
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
@@ -94,16 +94,22 @@
9494
<Filter Name="Likelihood">
9595
<File RelativePath="..\source\bao.f90"/>
9696
<File RelativePath="..\source\CMB.f90"/>
97-
<File RelativePath="..\source\CMBlikes.f90"/>
97+
<File RelativePath="..\source\CMB_BK_Planck.f90"/>
98+
<File RelativePath="..\source\CMBlikes.f90">
99+
<FileConfiguration Name="Debug|x64">
100+
<Tool Name="VFFortranCompilerTool" WarnUnusedVariables="true"/></FileConfiguration></File>
98101
<File RelativePath="..\source\DataLikelihoods.f90"/>
102+
<File RelativePath="..\source\ElementAbundances.f90"/>
99103
<File RelativePath="..\source\HST.f90"/>
100104
<File RelativePath="..\source\likelihood.f90"/>
101105
<File RelativePath="..\source\mpk.f90"/>
102106
<File RelativePath="..\source\supernovae.f90"/>
103107
<File RelativePath="..\source\supernovae_JLA.f90"/>
104108
<File RelativePath="..\source\supernovae_SNLS.f90"/>
105109
<File RelativePath="..\source\supernovae_Union2.f90"/>
106-
<File RelativePath="..\source\wigglez.f90"/></Filter>
110+
<File RelativePath="..\source\szcounts.f90"/>
111+
<File RelativePath="..\source\wigglez.f90"/>
112+
<File RelativePath="..\source\wl.f90"/></Filter>
107113
<Filter Name="Utils">
108114
<File RelativePath="..\source\ArrayUtils.f90"/>
109115
<File RelativePath="..\source\FileUtils.f90"/>

‎VisualStudio/GetDist.vfproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<Tool Name="VFPostBuildEventTool"/>
2626
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
2727
<Configuration Name="Debug|x64">
28-
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" MultiProcessorCompilation="true" Optimization="optimizeDisabled" Preprocess="preprocessYes" PreprocessorDefinitions="NOWMAP" ErrorLimit="4" WarnDeclarations="true" WarnUnusedVariables="true" WarnTruncateSource="true" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug" UseMkl="mklParallel"/>
28+
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" MultiProcessorCompilation="true" Optimization="optimizeDisabled" Preprocess="preprocessYes" PreprocessorDefinitions="NOWMAP" ErrorLimit="4" StandardWarnings="standardWarningsF08" WarnDeclarations="true" WarnUnusedVariables="true" WarnTruncateSource="true" Traceback="true" BoundsCheck="true" StackFrameCheck="true" RuntimeLibrary="rtMultiThreadedDebug" UseMkl="mklParallel"/>
2929
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemConsole" StackReserveSize="10000000"/>
3030
<Tool Name="VFResourceCompilerTool"/>
3131
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
@@ -60,7 +60,9 @@
6060
<File RelativePath="..\source\ObjectParamNames.f90"/>
6161
<File RelativePath="..\source\RandUtils.f90"/>
6262
<File RelativePath="..\source\StringUtils.f90"/></Filter>
63-
<File RelativePath="..\source\GetDist.f90"/>
63+
<File RelativePath="..\source\GetDist.f90">
64+
<FileConfiguration Name="Debug|x64">
65+
<Tool Name="VFFortranCompilerTool" StandardWarnings="standardWarningsF08"/></FileConfiguration></File>
6466
<File RelativePath="..\source\IO.f90"/>
6567
<File RelativePath="..\source\samples.f90"/>
6668
<File RelativePath="..\source\settings.f90"/></Filter></Files>

0 commit comments

Comments
 (0)