EgtNumKernel 2.3g1 :
- versione x64 compilata con Clang-cl/LLVM - modifiche varie per eliminare warning più gravi di questo compilatore.
This commit is contained in:
Binary file not shown.
@@ -35,7 +35,7 @@
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<PlatformToolset>ClangCL</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
@@ -49,7 +49,7 @@
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v142</PlatformToolset>
|
||||
<PlatformToolset>ClangCL</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
@@ -124,6 +124,7 @@ copy $(TargetPath) \EgtProg\DllD32</Command>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;I_AM_ENK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<OpenMPSupport>true</OpenMPSupport>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
@@ -184,6 +185,7 @@ copy $(TargetPath) \EgtProg\Dll32</Command>
|
||||
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
|
||||
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
|
||||
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
|
||||
+2
-1
@@ -1007,7 +1007,7 @@ Cpoly::fxshft( const int l2, double* zr, double* zi, bool* pbConv)
|
||||
|
||||
// Test for convergence unless stage 3 has failed once or this
|
||||
// is the last H Polynomial
|
||||
if ( ! ( bBol || ! bTest || j == 12))
|
||||
if ( ! ( bBol || ! bTest || j == 12)) {
|
||||
if ( cmod( tr - otr, ti - oti) < 0.5 * cmod( *zr, *zi)) {
|
||||
if ( bPasd) {
|
||||
// The weak convergence test has been passwed twice, start the third stage
|
||||
@@ -1038,6 +1038,7 @@ Cpoly::fxshft( const int l2, double* zr, double* zi, bool* pbConv)
|
||||
}
|
||||
else
|
||||
bPasd = false ;
|
||||
}
|
||||
}
|
||||
|
||||
// Attempt an iteration with final H polynomial from second stage
|
||||
|
||||
+3
-3
@@ -39,9 +39,9 @@ class Rpoly {
|
||||
int itercnt ;
|
||||
|
||||
private : // members
|
||||
int n, nn, nmi ;
|
||||
double sr, si, u, v, a, b, c, d, a1, a2 ;
|
||||
double a3, a6, a7, e, f, g, h, szr, szi, lzr, lzi ;
|
||||
int n ;
|
||||
double sr, si, u, v, a, b, c, d, a1, a3, a7 ;
|
||||
double e, f, g, h, szr, szi, lzr, lzi ;
|
||||
double eta, are, mre ;
|
||||
double p[POLY_MAXDEG+1] ;
|
||||
double qp[POLY_MAXDEG+1] ;
|
||||
|
||||
Reference in New Issue
Block a user