|
|
@@ -55,7 +55,6 @@
|
|
|
<#if vo.surro??>
|
|
|
<name>${vo.surro.algorithm?lower_case}</name>
|
|
|
<configuration>
|
|
|
- <optimization>
|
|
|
<iout>${vo.surro.iout}</iout>
|
|
|
<irestart>${vo.surro.irestart}</irestart>
|
|
|
<ndoe>${vo.surro.ndoe}</ndoe>
|
|
|
@@ -68,8 +67,6 @@
|
|
|
<x_tol>${vo.surro.xTol}</x_tol>
|
|
|
<feasibility_tol_real>${vo.surro.feasibilityTolReal}</feasibility_tol_real>
|
|
|
<feasibility_tol_surro>${vo.surro.feasibilityTolSurro}</feasibility_tol_surro>
|
|
|
- </optimization>
|
|
|
- <model>
|
|
|
<nsurro>${vo.surro.nsurro}</nsurro>
|
|
|
<n_kriging>${vo.surro.nKriging}</n_kriging>
|
|
|
<corr>${vo.surro.corr}</corr>
|
|
|
@@ -78,8 +75,6 @@
|
|
|
<dcmp>${vo.surro.dcmp}</dcmp>
|
|
|
<paraopt>${vo.surro.paraopt}</paraopt>
|
|
|
<regular>${vo.surro.regular}</regular>
|
|
|
- </model>
|
|
|
- <subopt>
|
|
|
<infill>${vo.surro.infill}</infill>
|
|
|
<nparallel>${vo.surro.nparallel}</nparallel>
|
|
|
<iopt>${vo.surro.iopt}</iopt>
|
|
|
@@ -88,7 +83,7 @@
|
|
|
<maxgen>${vo.surro.maxgen}</maxgen>
|
|
|
<pc>${vo.surro.pc}</pc>
|
|
|
<pm>${vo.surro.pm}</pm>
|
|
|
- </subopt>
|
|
|
+ <myid_number>1</myid_number>
|
|
|
</configuration>
|
|
|
<#else>
|
|
|
</#if>
|
|
|
@@ -112,12 +107,10 @@
|
|
|
<#if b.cpacsPath??>
|
|
|
<cpacsPath>${b.cpacsPath}</cpacsPath>
|
|
|
<#else>
|
|
|
- <cpacsPath/>
|
|
|
</#if>
|
|
|
<#if b.workflowPath??>
|
|
|
<workflowPath>${b.workflowPath}</workflowPath>
|
|
|
<#else>
|
|
|
- <workflowPath/>
|
|
|
</#if>
|
|
|
<#if b.pythonPath??>
|
|
|
<pythonPath name="${b.stype}">${b.pythonPath}</pythonPath>
|
