Commit 1e1ec52e authored by Jorn Bruggeman's avatar Jorn Bruggeman
Browse files

updated build systems to work without compiling driver first

parent 226da77e
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject ProjectCreator="Intel Fortran" Keyword="Console Application" Version="11.0" ProjectIdGuid="{B6A5514C-5B9C-4E70-9BD7-767888D45B30}">
<Platforms>
<Platform Name="Win32"/></Platforms>
<Platform Name="Win32"/>
<Platform Name="x64"/></Platforms>
<Configurations>
<Configuration Name="Debug|Win32" OutputDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="$(ProjectDir)\..\..\include;$(FABMDIR)\include;$(FABMDIR)\src\drivers\0d;$(GOTMDIR)\include;$(GOTMDIR)\compilers\vs2010" PreprocessorDefinitions="REAL_4B=real(4);FORTRAN95;NUDGE_VEL;NETCDF_FMT;SEAGRASS;BIO;LAGRANGE;BIO_NPZD;BIO_IOW;BIO_FASHAM;BIO_SED;BIO_NPZD_FE;BIO_PHOTO;GUSTINESS;_FABM_" WarnInterfaces="true" FloatingPointSpeculation="fpSpeculationOff" Traceback="true" BoundsCheck="true" UninitializedVariablesCheck="true" ArgTempCreatedCheck="true" RuntimeLibrary="rtMultiThreadedDebug" ImproveFloatingPointConsistency="true" Interfaces="true"/>
......@@ -22,6 +23,26 @@
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Debug|x64" OutputDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="$(ProjectDir)\..\..\include;$(FABMDIR)\include;$(FABMDIR)\src\drivers\0d;$(GOTMDIR)\include;$(GOTMDIR)\compilers\vs2010" PreprocessorDefinitions="REAL_4B=real(4);FORTRAN95;NUDGE_VEL;NETCDF_FMT;SEAGRASS;BIO;LAGRANGE;BIO_NPZD;BIO_IOW;BIO_FASHAM;BIO_SED;BIO_NPZD_FE;BIO_PHOTO;GUSTINESS;_FABM_" WarnInterfaces="true" FloatingPointSpeculation="fpSpeculationOff" Traceback="true" BoundsCheck="true" UninitializedVariablesCheck="true" ArgTempCreatedCheck="true" RuntimeLibrary="rtMultiThreadedDebug" ImproveFloatingPointConsistency="true" Interfaces="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" GenerateDebugInformation="true" SubSystem="subSystemConsole" StackReserveSize="32000000"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Release|x64" OutputDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Preprocess="preprocessYes" AdditionalIncludeDirectories="$(ProjectDir)\..\..\include;$(FABMDIR)\include;$(FABMDIR)\src\drivers\0d;$(GOTMDIR)\include;$(GOTMDIR)\compilers\vs2010" PreprocessorDefinitions="REAL_4B=real(4);FORTRAN95;NUDGE_VEL;NETCDF_FMT;SEAGRASS;BIO;LAGRANGE;BIO_NPZD;BIO_IOW;BIO_FASHAM;BIO_SED;BIO_NPZD_FE;BIO_PHOTO;GUSTINESS;_FABM_"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" SubSystem="subSystemConsole"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
<Files>
<Filter Name="Header Files" Filter="fi;fd">
......
<?xml version="1.0" encoding="UTF-8"?>
<VisualStudioProject ProjectType="typeStaticLibrary" ProjectCreator="Intel Fortran" Keyword="Static Library" Version="11.0" ProjectIdGuid="{7D63F885-F1D8-469C-A076-488A23EB592B}">
<Platforms>
<Platform Name="Win32"/></Platforms>
<Platform Name="Win32"/>
<Platform Name="x64"/></Platforms>
<Configurations>
<Configuration Name="Debug|Win32" OutputDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" ConfigurationType="typeStaticLibrary">
<Tool Name="VFFortranCompilerTool" AdditionalOptions="/Qsave-temps" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src\drivers\0d;$(ProjectDir)\..\..\src\models\aed" PreprocessorDefinitions="_ISO_TR_15581_;_FABM_F2003_" StandardWarnings="standardWarningsF03" WarnDeclarations="true" WarnUnusedVariables="true" WarnInterfaces="true" InitLocalVarToNAN="true" FloatingPointSpeculation="fpSpeculationOff" Traceback="true" NullPointerCheck="true" BoundsCheck="true" UninitializedVariablesCheck="true" DescriptorDataTypeCheck="true" DescriptorDataSizeCheck="true" ArgTempCreatedCheck="true" RuntimeLibrary="rtMultiThreadedDebug" ImproveFloatingPointConsistency="true" Interfaces="true"/>
......@@ -24,6 +25,28 @@
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Debug|x64" OutputDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" ConfigurationType="typeStaticLibrary">
<Tool Name="VFFortranCompilerTool" AdditionalOptions="/Qsave-temps" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src\drivers\0d;$(ProjectDir)\..\..\src\models\aed" PreprocessorDefinitions="_ISO_TR_15581_;_FABM_F2003_" StandardWarnings="standardWarningsF03" WarnDeclarations="true" WarnUnusedVariables="true" WarnInterfaces="true" InitLocalVarToNAN="true" FloatingPointSpeculation="fpSpeculationOff" Traceback="true" NullPointerCheck="true" BoundsCheck="true" UninitializedVariablesCheck="true" DescriptorDataTypeCheck="true" DescriptorDataSizeCheck="true" ArgTempCreatedCheck="true" RuntimeLibrary="rtMultiThreadedDebug" ImproveFloatingPointConsistency="true" Interfaces="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(GOTMDIR)\extras\netcdf\win32\3.6.3\lib" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="netcdfs.lib"/>
<Tool Name="VFLibrarianTool"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Release|x64" OutputDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" ConfigurationType="typeStaticLibrary">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Preprocess="preprocessYes" AdditionalIncludeDirectories="$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src\drivers\0d;$(ProjectDir)\..\..\src\models\aed" PreprocessorDefinitions="_ISO_TR_15581_;_FABM_F2003_" VectorizerDiagLevel="vectorizerDiagLevel3" WarnUnusedVariables="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(GOTMDIR)\extras\netcdf\win32\3.6.3\lib" SubSystem="subSystemConsole" AdditionalDependencies="netcdfs.lib"/>
<Tool Name="VFLibrarianTool"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
<Files>
<Filter Name="Header Files" Filter="fi;fd">
......
......@@ -22,7 +22,7 @@
<ProjectGuid>{AABA89F4-40E4-4269-817F-0E37191728F2}</ProjectGuid>
<RootNamespace>c++</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>fabm_python-c++</ProjectName>
<ProjectName>fabm-python-c++</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
......@@ -91,7 +91,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>python26.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)model.pyd</OutputFile>
<OutputFile>$(OutDir)fabm_fortran.pyd</OutputFile>
<AdditionalLibraryDirectories>$(PythonDir)\libs;$(IFORT_COMPILER13)\compiler\lib\ia32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>python26_d.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
......@@ -147,7 +147,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>python26.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)model.pyd</OutputFile>
<OutputFile>$(OutDir)fabm_fortran.pyd</OutputFile>
<AdditionalLibraryDirectories>$(PythonDir)\libs;$(IFORT_COMPILER13)\compiler\lib\ia32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
......@@ -163,6 +163,7 @@
</DataExecutionPrevention>
<ImportLibrary>$(OutDir)c++.lib</ImportLibrary>
<TargetMachine>MachineX86</TargetMachine>
<IgnoreSpecificDefaultLibraries>python26_d.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
......@@ -180,7 +181,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>fabm_python-f90.lib;python27.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)model.pyd</OutputFile>
<OutputFile>$(OutDir)fabm_fortran.pyd</OutputFile>
<AdditionalLibraryDirectories>$(OutDir)\..\fabm_python-f90;$(Python64Dir)\libs;$(IFORT_COMPILER14)\compiler\lib\intel64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
......
......@@ -23,13 +23,13 @@
<Tool Name="VFMidlTool" SuppressStartupBanner="true"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFPreLinkEventTool"/>
<Tool Name="VFPreBuildEventTool"/>
<Tool Name="VFPreBuildEventTool" CommandLine="&quot;$(Python64Dir)\Scripts\f2py.exe&quot; &quot;$(ProjectDir)..\..\src\drivers\python\fabm_python.F90&quot; -m fabm --no-lower --overwrite-signature"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
<Configuration Name="Debug|x64" OutputDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" ConfigurationType="typeStaticLibrary">
<Tool Name="VFFortranCompilerTool" AdditionalOptions="/Qsave-temps" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" Preprocess="preprocessYes" AdditionalIncludeDirectories="$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src\drivers\python;$(ProjectDir)\..\..\src\models\aed" PreprocessorDefinitions="_ISO_TR_15581_;_FABM_F2003_" StandardWarnings="standardWarningsF03" StandardWarningsAsErrors="true" WarnDeclarations="true" WarnUnusedVariables="true" WarnInterfaces="true" InitLocalVarToNAN="true" FloatingPointSpeculation="fpSpeculationOff" Traceback="true" RuntimeChecks="rtChecksAll" NullPointerCheck="true" BoundsCheck="true" UninitializedVariablesCheck="true" DescriptorDataTypeCheck="true" DescriptorDataSizeCheck="true" ArgTempCreatedCheck="true" RuntimeLibrary="rtMultiThreadedDebug" ImproveFloatingPointConsistency="true" Interfaces="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(GOTMDIR)\extras\netcdf\win32\3.6.3\lib" GenerateDebugInformation="true" SubSystem="subSystemConsole" AdditionalDependencies="netcdfs.lib"/>
<Tool Name="VFLibrarianTool"/>
<Tool Name="VFLibrarianTool" LinkLibraryDependencies="true"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
......@@ -40,7 +40,7 @@
<Configuration Name="Release|x64" OutputDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" IntermediateDirectory="$(PlatformName)-$(ConfigurationName)\$(ProjectName)" ConfigurationType="typeStaticLibrary">
<Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" Preprocess="preprocessYes" AdditionalIncludeDirectories="$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\src\drivers\python;$(ProjectDir)\..\..\src\models\aed" PreprocessorDefinitions="_ISO_TR_15581_;_FABM_F2003_" VectorizerDiagLevel="vectorizerDiagLevel3" WarnUnusedVariables="true"/>
<Tool Name="VFLinkerTool" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="$(GOTMDIR)\extras\netcdf\win32\3.6.3\lib" SubSystem="subSystemConsole" AdditionalDependencies="netcdfs.lib"/>
<Tool Name="VFLibrarianTool"/>
<Tool Name="VFLibrarianTool" LinkLibraryDependencies="true"/>
<Tool Name="VFResourceCompilerTool"/>
<Tool Name="VFMidlTool" SuppressStartupBanner="true" TargetEnvironment="midlTargetAMD64"/>
<Tool Name="VFCustomBuildTool"/>
......@@ -85,7 +85,6 @@
<File RelativePath="..\..\src\config\fabm_yaml.F90"/></Filter>
<Filter Name="driver">
<File RelativePath=".\fabm-f2pywrappers2.f90"/>
<File RelativePath="..\..\src\drivers\python\fabm_driver.F90"/>
<File RelativePath="..\..\src\drivers\python\fabm_python.F90"/>
<File RelativePath="..\..\src\drivers\python\helper.F90"/></Filter></Filter></Files>
<Globals/></VisualStudioProject>
......@@ -24,12 +24,12 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "turbulence", "%GOTMDIR%\com
{12FF14CF-D057-46BD-8BD3-8C957A1016DC} = {12FF14CF-D057-46BD-8BD3-8C957A1016DC}
EndProjectSection
EndProject
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "fabm_python-f90", "fabm_python-f90.vfproj", "{30B75A58-40FE-4D39-BCBE-0B50BC95665E}"
Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "fabm-python-f90", "fabm-python-f90.vfproj", "{30B75A58-40FE-4D39-BCBE-0B50BC95665E}"
ProjectSection(ProjectDependencies) = postProject
{7D63F885-F1D8-469C-A076-488A23EB592B} = {7D63F885-F1D8-469C-A076-488A23EB592B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fabm_python-c++", "fabm_python-c++.vcxproj", "{AABA89F4-40E4-4269-817F-0E37191728F2}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fabm-python-c++", "fabm-python-c++.vcxproj", "{AABA89F4-40E4-4269-817F-0E37191728F2}"
ProjectSection(ProjectDependencies) = postProject
{30B75A58-40FE-4D39-BCBE-0B50BC95665E} = {30B75A58-40FE-4D39-BCBE-0B50BC95665E}
EndProjectSection
......@@ -44,41 +44,52 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B6A5514C-5B9C-4E70-9BD7-767888D45B30}.Debug|Win32.ActiveCfg = Debug|Win32
{B6A5514C-5B9C-4E70-9BD7-767888D45B30}.Debug|Win32.Build.0 = Debug|Win32
{B6A5514C-5B9C-4E70-9BD7-767888D45B30}.Debug|x64.ActiveCfg = Debug|Win32
{B6A5514C-5B9C-4E70-9BD7-767888D45B30}.Debug|x64.ActiveCfg = Debug|x64
{B6A5514C-5B9C-4E70-9BD7-767888D45B30}.Debug|x64.Build.0 = Debug|x64
{B6A5514C-5B9C-4E70-9BD7-767888D45B30}.Release|Win32.ActiveCfg = Release|Win32
{B6A5514C-5B9C-4E70-9BD7-767888D45B30}.Release|Win32.Build.0 = Release|Win32
{B6A5514C-5B9C-4E70-9BD7-767888D45B30}.Release|x64.ActiveCfg = Release|Win32
{B6A5514C-5B9C-4E70-9BD7-767888D45B30}.Release|x64.ActiveCfg = Release|x64
{B6A5514C-5B9C-4E70-9BD7-767888D45B30}.Release|x64.Build.0 = Release|x64
{7D63F885-F1D8-469C-A076-488A23EB592B}.Debug|Win32.ActiveCfg = Debug|Win32
{7D63F885-F1D8-469C-A076-488A23EB592B}.Debug|Win32.Build.0 = Debug|Win32
{7D63F885-F1D8-469C-A076-488A23EB592B}.Debug|x64.ActiveCfg = Debug|Win32
{7D63F885-F1D8-469C-A076-488A23EB592B}.Debug|x64.ActiveCfg = Debug|x64
{7D63F885-F1D8-469C-A076-488A23EB592B}.Debug|x64.Build.0 = Debug|x64
{7D63F885-F1D8-469C-A076-488A23EB592B}.Release|Win32.ActiveCfg = Release|Win32
{7D63F885-F1D8-469C-A076-488A23EB592B}.Release|Win32.Build.0 = Release|Win32
{7D63F885-F1D8-469C-A076-488A23EB592B}.Release|x64.ActiveCfg = Release|Win32
{7D63F885-F1D8-469C-A076-488A23EB592B}.Release|x64.ActiveCfg = Release|x64
{7D63F885-F1D8-469C-A076-488A23EB592B}.Release|x64.Build.0 = Release|x64
{174594F8-545B-4E1D-B36C-2350F66F038A}.Debug|Win32.ActiveCfg = Debug-nobio|Win32
{174594F8-545B-4E1D-B36C-2350F66F038A}.Debug|Win32.Build.0 = Debug-nobio|Win32
{174594F8-545B-4E1D-B36C-2350F66F038A}.Debug|x64.ActiveCfg = Debug|Win32
{174594F8-545B-4E1D-B36C-2350F66F038A}.Debug|x64.ActiveCfg = Debug|x64
{174594F8-545B-4E1D-B36C-2350F66F038A}.Debug|x64.Build.0 = Debug|x64
{174594F8-545B-4E1D-B36C-2350F66F038A}.Release|Win32.ActiveCfg = Release-nobio|Win32
{174594F8-545B-4E1D-B36C-2350F66F038A}.Release|Win32.Build.0 = Release-nobio|Win32
{174594F8-545B-4E1D-B36C-2350F66F038A}.Release|x64.ActiveCfg = Release|Win32
{174594F8-545B-4E1D-B36C-2350F66F038A}.Release|x64.ActiveCfg = Release|x64
{174594F8-545B-4E1D-B36C-2350F66F038A}.Release|x64.Build.0 = Release|x64
{12FF14CF-D057-46BD-8BD3-8C957A1016DC}.Debug|Win32.ActiveCfg = Debug|Win32
{12FF14CF-D057-46BD-8BD3-8C957A1016DC}.Debug|Win32.Build.0 = Debug|Win32
{12FF14CF-D057-46BD-8BD3-8C957A1016DC}.Debug|x64.ActiveCfg = Debug|Win32
{12FF14CF-D057-46BD-8BD3-8C957A1016DC}.Debug|x64.ActiveCfg = Debug|x64
{12FF14CF-D057-46BD-8BD3-8C957A1016DC}.Debug|x64.Build.0 = Debug|x64
{12FF14CF-D057-46BD-8BD3-8C957A1016DC}.Release|Win32.ActiveCfg = Release|Win32
{12FF14CF-D057-46BD-8BD3-8C957A1016DC}.Release|Win32.Build.0 = Release|Win32
{12FF14CF-D057-46BD-8BD3-8C957A1016DC}.Release|x64.ActiveCfg = Release|Win32
{12FF14CF-D057-46BD-8BD3-8C957A1016DC}.Release|x64.ActiveCfg = Release|x64
{12FF14CF-D057-46BD-8BD3-8C957A1016DC}.Release|x64.Build.0 = Release|x64
{195325CC-732D-4F1C-ABAD-A9B118351236}.Debug|Win32.ActiveCfg = Debug|Win32
{195325CC-732D-4F1C-ABAD-A9B118351236}.Debug|Win32.Build.0 = Debug|Win32
{195325CC-732D-4F1C-ABAD-A9B118351236}.Debug|x64.ActiveCfg = Debug|Win32
{195325CC-732D-4F1C-ABAD-A9B118351236}.Debug|x64.ActiveCfg = Debug|x64
{195325CC-732D-4F1C-ABAD-A9B118351236}.Debug|x64.Build.0 = Debug|x64
{195325CC-732D-4F1C-ABAD-A9B118351236}.Release|Win32.ActiveCfg = Release|Win32
{195325CC-732D-4F1C-ABAD-A9B118351236}.Release|Win32.Build.0 = Release|Win32
{195325CC-732D-4F1C-ABAD-A9B118351236}.Release|x64.ActiveCfg = Release|Win32
{195325CC-732D-4F1C-ABAD-A9B118351236}.Release|x64.ActiveCfg = Release|x64
{195325CC-732D-4F1C-ABAD-A9B118351236}.Release|x64.Build.0 = Release|x64
{30B75A58-40FE-4D39-BCBE-0B50BC95665E}.Debug|Win32.ActiveCfg = Debug|Win32
{30B75A58-40FE-4D39-BCBE-0B50BC95665E}.Debug|Win32.Build.0 = Debug|Win32
{30B75A58-40FE-4D39-BCBE-0B50BC95665E}.Debug|x64.ActiveCfg = Debug|x64
{30B75A58-40FE-4D39-BCBE-0B50BC95665E}.Debug|x64.Build.0 = Debug|x64
{30B75A58-40FE-4D39-BCBE-0B50BC95665E}.Release|Win32.ActiveCfg = Release|Win32
{30B75A58-40FE-4D39-BCBE-0B50BC95665E}.Release|Win32.Build.0 = Release|Win32
{30B75A58-40FE-4D39-BCBE-0B50BC95665E}.Release|x64.ActiveCfg = Release|Win32
{30B75A58-40FE-4D39-BCBE-0B50BC95665E}.Release|x64.ActiveCfg = Release|x64
{30B75A58-40FE-4D39-BCBE-0B50BC95665E}.Release|x64.Build.0 = Release|x64
{AABA89F4-40E4-4269-817F-0E37191728F2}.Debug|Win32.ActiveCfg = Debug|Win32
{AABA89F4-40E4-4269-817F-0E37191728F2}.Debug|Win32.Build.0 = Debug|Win32
{AABA89F4-40E4-4269-817F-0E37191728F2}.Debug|x64.ActiveCfg = Debug|x64
......
......@@ -14,4 +14,4 @@
#undef _SAVE_DEBUG
#endif
#include "fabm_fortranmodule.c"
\ No newline at end of file
#include "fabmmodule.c"
\ No newline at end of file
include Rules.make
SUBDIRS = models
SUBDIRS = models drivers config
SUBDIRS = models config
DOCSRC = fabm.F90 fabm_types.F90
......@@ -17,14 +16,9 @@ makedirs:
config: $(FABMMOD)
$(MAKE) -C config
$(FABMBASE): driver
driver:
$(MAKE) -C drivers/$(FABMHOST)
$(FABMMOD): models $(FABMMODELLIB)
models: driver $(FABMBASE)
models: $(FABMBASE)
$(MAKE) -C models
0d getm gotm mossco python:
......@@ -46,4 +40,4 @@ distclean: realclean
$(RM) -r doc
$(RM) -r $(FABMDIR)/modules/ $(FABMDIR)/lib/
.PHONY: makedirs models driver config
.PHONY: all makedirs models config doc clean realclean distclean
include ../Rules.make
#SUBDIRS += 0d getm gotm mom4p0d mom4p1
SUBDIRS += 0d gotm mossco
doc clean:
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
\chapter{FABM drivers \label{chap:drivers}}
\input{../src/drivers/0d/0d}
\input{../src/drivers/getm/getm}
\input{../src/drivers/gotm/gotm}
\input{../src/drivers/mom4p0d/mom4p0d}
\input{../src/drivers/mom4p1/mom4p1}
......@@ -10,12 +10,9 @@ ifeq ($(FORTRAN_COMPILER),GFORTRAN)
SETUPARGS+=--fcompiler=gnu95
endif
OBJ = ${LIBFABM}(fabm_driver.o)
EXTRA_FFLAGS+=-fPIC
all: obj
obj: $(OBJ)
all: python
fabm:
$(MAKE) EXTRA_FFLAGS=-fPIC -C $(FABMDIR)/src all
......@@ -24,14 +21,15 @@ ${LIBFABM}(helper.o): fabm
python: ${LIBFABM}(helper.o)
./setup.py build_ext --inplace $(SETUPARGS)
clean:
$(RM) *.o *.mod *~
$(RM) -r build dist
$(RM) -rf build dist
realclean: clean
$(RM) -r fabm_fortran
$(RM) -rf fabm_fortran
distclean: realclean
$(MAKE) -C $(FABMDIR)/src $@
.PHONY: makedirs
.PHONY: all fabm python clean realclean distclean
#include "fabm_driver.h"
module fabm_driver
implicit none
public fatal_error,log_message
private
contains
subroutine fatal_error(routine,errormsg)
character(len=*), intent(in) :: routine,errormsg
write (*,*) trim(routine)//': '//trim(errormsg)
stop 1
end subroutine fatal_error
subroutine log_message(msg)
character(len=*), intent(in) :: msg
!write (*,*) trim(msg)
end subroutine log_message
end module fabm_driver
......@@ -13,7 +13,7 @@
! !USES:
use fabm
use fabm_config
use fabm_types, only:rk,attribute_length
use fabm_types, only:rk,attribute_length,type_base_driver
use fabm_properties, only: type_property, type_property_dictionary
use fabm_python_helper
......@@ -31,6 +31,12 @@
integer, dimension(:),allocatable :: parameter_types
type (type_property_dictionary),save,private :: forced_parameters
type,extends(type_base_driver) :: type_python_driver
contains
procedure :: fatal_error
procedure :: log_message
end type
!EOP
!-----------------------------------------------------------------------
......@@ -231,6 +237,21 @@
value = property%to_string()
end function
subroutine fatal_error(self,location,message)
class (type_python_driver),intent(inout) :: self
character(len=*), intent(in) :: location,message
write (*,*) trim(location)//': '//trim(message)
stop 1
end subroutine fatal_error
subroutine log_message(self,message)
class (type_python_driver),intent(inout) :: self
character(len=*), intent(in) :: message
!write (*,*) trim(message)
end subroutine log_message
end module fabm_python
!-----------------------------------------------------------------------
......
......@@ -3880,7 +3880,7 @@ end subroutine
subroutine base_driver_fatal_error(self,location,message)
class (type_base_driver), intent(inout) :: self
character(len=*), intent(in) :: location,message
character(len=*), intent(in) :: location,message
write (*,*) trim(location)//': '//trim(message)
stop 1
......@@ -3888,7 +3888,7 @@ end subroutine
subroutine base_driver_log_message(self,message)
class (type_base_driver), intent(inout) :: self
character(len=*), intent(in) :: message
character(len=*), intent(in) :: message
write (*,*) trim(message)
end subroutine
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment