diff --git a/BayesValidRox/tests/PA-A/ffpm_validation_stokesdarcy.py b/BayesValidRox/tests/PA-A/ffpm_validation_stokesdarcy.py
index e90ef07079fa9b051d6c91c2576d16f40d963c3b..4ded6af5d9330b90b9066cfb7efb87e81d973cc9 100755
--- a/BayesValidRox/tests/PA-A/ffpm_validation_stokesdarcy.py
+++ b/BayesValidRox/tests/PA-A/ffpm_validation_stokesdarcy.py
@@ -521,7 +521,7 @@ def run(params, errorPerc=0.05, couplingcond='BJ', PCEEDMethod='normal'):
#============== Save class objects =================
#=====================================================
with open('PA_A_Bayes'+ValidModel.Name+'.pkl', 'wb') as output:
- pickle.joblib(BayesValid, output, 2)
+ joblib.dump(BayesValid, output, 2)
#=====================================================
#================= Visualization ===================
diff --git a/BayesValidRox/tests/PA-A/ffpm_validation_stokespnm.py b/BayesValidRox/tests/PA-A/ffpm_validation_stokespnm.py
index bd79bde60949fa7d775ba3013ab6c5e4a23c20bc..c599c4449d03aa41627bba29840ee107c6dbddcb 100755
--- a/BayesValidRox/tests/PA-A/ffpm_validation_stokespnm.py
+++ b/BayesValidRox/tests/PA-A/ffpm_validation_stokespnm.py
@@ -83,7 +83,7 @@ def run(params, averaging=True,errorPerc=0.05, PCEEDMethod='normal'):
Model.InputFile = 'stokespnm_params.input'
Model.InputTemplate = 'stokespnm_params.tpl.input'
- Model.Command = "model_exe.py stokespnm stokespnm_params.input"
+ Model.Command = "model_exe.py stokespnm stokespnm_params.input --averaging {}".format(averaging)
Model.ExecutionPath = os.getcwd()
Model.Output.Parser = 'read_ffpm'
Model.Output.Names = ['velocity [m/s]', 'p']
@@ -100,33 +100,26 @@ def run(params, averaging=True,errorPerc=0.05, PCEEDMethod='normal'):
#=====================================================
Inputs = Input()
MCSize = 50000
-
+
# Assuming dependent input variables
# Inputs.Rosenblatt = True
-
+
Inputs.addMarginals() #VyMaxTop
Inputs.Marginals[0].Name = '$V^{top}$' # [5e-4, 1.5e-3]
- # Inputs.Marginals[0].InputValues = stats.uniform(loc=5.0e-04, scale=1.5e-03-5.0e-04).rvs(size=MCSize)
- Inputs.Marginals[0].DistType = 'unif'
- Inputs.Marginals[0].Parameters = [5e-4, 1.5e-3]
+ Inputs.Marginals[0].InputValues = stats.uniform(loc=5.0e-04, scale=1.5e-03-5.0e-04).rvs(size=MCSize)
Inputs.addMarginals() #TransmissibilityThroat '$g_{t,ij}$'
Inputs.Marginals[1].Name = '$g_{ij}$' # [1.0e-7, 1.0e-04]
- # Inputs.Marginals[1].InputValues = stats.uniform(loc=1.0e-7, scale=1.0e-04-1.0e-7).rvs(size=MCSize)
- Inputs.Marginals[1].DistType = 'unif'
- Inputs.Marginals[1].Parameters = [1.0e-7, 1.0e-04]
+ Inputs.Marginals[1].InputValues = stats.uniform(loc=1.0e-7, scale=1.0e-04-1.0e-7).rvs(size=MCSize)
Inputs.addMarginals() #TransmissibilityHalfPore '$g_{p,i}$'
Inputs.Marginals[2].Name = '$g_{i/j}$' # [1.0e-7, 1.0e-04]
- # Inputs.Marginals[2].InputValues = stats.uniform(loc=1.0e-7, scale=1.0e-04-1.0e-7).rvs(size=MCSize)
- Inputs.Marginals[2].DistType = 'unif'
- Inputs.Marginals[2].Parameters = [1.0e-7, 1.0e-04]
+ Inputs.Marginals[2].InputValues = stats.uniform(loc=1.0e-7, scale=1.0e-04-1.0e-7).rvs(size=MCSize)
+
Inputs.addMarginals() #'$\\beta_{pore}$'
Inputs.Marginals[3].Name = '$\\beta_{pore}$' # [1000.0, 100000.0]
- # Inputs.Marginals[3].InputValues = stats.uniform(loc=1e3, scale=1e5-1e3).rvs(size=MCSize)
- Inputs.Marginals[3].DistType = 'unif'
- Inputs.Marginals[3].Parameters = [1000.0, 100000.0]
+ Inputs.Marginals[3].InputValues = stats.uniform(loc=1e3, scale=1e5-1e3).rvs(size=MCSize)
#=====================================================
#========== DEFINITION OF THE METAMODEL ============
@@ -251,19 +244,19 @@ def run(params, averaging=True,errorPerc=0.05, PCEEDMethod='normal'):
print("\n" + "-"*40)
print("PCE training for calibration.")
print("-"*40 + "\n")
- if averaging:
- PCEModel = MetaModelOpts.create_metamodel(Model)
+ # if averaging:
+ PCEModel = MetaModelOpts.create_metamodel(Model)
- # Remove zip file
- if os.path.isfile(Model.Name + '.zip'): os.remove(Model.Name + '.zip')
+ # Remove zip file
+ if os.path.isfile(Model.Name + '.zip'): os.remove(Model.Name + '.zip')
- else:
- # Load the objects
- saved_Dir = './outputs_ffpm-stokespnm/'
- with open(saved_Dir+'PCEModel_'+'ffpm-stokespnm'+'.pkl', 'rb') as input:
- PCEModel = pickle.load(input)
+ # else:
+ # # Load the objects
+ # saved_Dir = './outputs_ffpm-stokespnm/'
+ # with open(saved_Dir+'PCEModel_'+'ffpm-stokespnm'+'.pkl', 'rb') as input:
+ # PCEModel = pickle.load(input)
- PCEModel.ModelObj.Name = 'ffpm-stokespnmNA'
+ # PCEModel.ModelObj.Name = 'ffpm-stokespnmNA'
# Save PCE models
with open('PCEModel_'+Model.Name+'.pkl', 'wb') as output:
@@ -581,5 +574,5 @@ def run(params, averaging=True,errorPerc=0.05, PCEEDMethod='normal'):
#==========================================================================
#==================== Run main scripts for PA-B =======================
#==========================================================================
-# PCEModel, BayesCalib, BayesValid = run(params, PCEEDMethod=PCEExpDesignMethod)
+# PCEModel, BayesCalib, BayesValid = run(params,averaging=False, PCEEDMethod=PCEExpDesignMethod)
# PCEModel = run(params, PCEEDMethod=PCEExpDesignMethod)
diff --git a/BayesValidRox/tests/PA-A/model_exe.py b/BayesValidRox/tests/PA-A/model_exe.py
index 1c621840c3c8b85bbdad0990451b3c3194aca421..b9714ad0aad091ad0a0518147fd60ab06bc8341b 100755
--- a/BayesValidRox/tests/PA-A/model_exe.py
+++ b/BayesValidRox/tests/PA-A/model_exe.py
@@ -24,7 +24,7 @@ args = vars(parser.parse_args())
# Specification
model = args['model']
inputFile = args['file']
-averaging = args['averaging']
+averaging = True if args['averaging']=='True' else False
# Run the model
if model == 'stokesdarcy':
diff --git a/BayesValidRox/tests/PA-A/models/stokes/stokes_regular_2d b/BayesValidRox/tests/PA-A/models/stokes/stokes_regular_2d
index 3ab685d345f1b747e84010de01fde6c1b8e781de..517477aa56df03cf67e3e110a63724122eed3c67 100755
Binary files a/BayesValidRox/tests/PA-A/models/stokes/stokes_regular_2d and b/BayesValidRox/tests/PA-A/models/stokes/stokes_regular_2d differ
diff --git a/BayesValidRox/tests/PA-A/models/stokesdarcy/stokes_darcybox_regular_2d b/BayesValidRox/tests/PA-A/models/stokesdarcy/stokes_darcybox_regular_2d
index 54120faef118c17a824f0df6e038b73d3cd25412..07c9ffc3580a39da1a06f31916142cc32d3a574c 100755
Binary files a/BayesValidRox/tests/PA-A/models/stokesdarcy/stokes_darcybox_regular_2d and b/BayesValidRox/tests/PA-A/models/stokesdarcy/stokes_darcybox_regular_2d differ
diff --git a/BayesValidRox/tests/PA-A/models/stokespnm/stokes_pnm_regular_2d b/BayesValidRox/tests/PA-A/models/stokespnm/stokes_pnm_regular_2d
index 32f76bf2d819c33611aa55ad14493af7c699e27c..aeb93134ab30c2f6381518a7520a7ca678601394 100755
Binary files a/BayesValidRox/tests/PA-A/models/stokespnm/stokes_pnm_regular_2d and b/BayesValidRox/tests/PA-A/models/stokespnm/stokes_pnm_regular_2d differ