Skip to content

Commit 17e711e

Browse files
afraniomeloafraniomelo
authored
Merge pull request #44 from petrobras/develop
Refactor files and methods for parametric analysis tool
2 parents 74fb44a + d9b3cdc commit 17e711e

19 files changed

Lines changed: 8591 additions & 8489 deletions

‎demos/2zones-2GLVs-2-Check-SA.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"initialFluidId": 0,
1919
"freeGasDensityCorrectionBO": true,
2020
"checkValve": 1,
21-
"sensitivityAnalysis": true,
21+
"parametricAnalysis": true,
2222
"advanced": {
2323
"monophasicCriterion": 1E-05,
2424
"condensationCriterion": 0.001,

demos/leituraAS.json renamed to demos/leituraAP.json

File renamed without changes.

demos/pt-br/2zonas-2VGLs-2-Check-AS.json renamed to demos/pt-br/2zonas-2VGLs-2-Check-AP.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"iniFluidoP":0,
1919
"correcaoDenGasLivreBlackOil":true,
2020
"CheckValve": 1,
21-
"AS":true,
21+
"AP":true,
2222
"Avancado": {
2323
"CriterioMonofasico": 1e-05,
2424
"CriterioCondensacao": 0.001,

demos/pt-br/leituraAS.json renamed to demos/pt-br/leituraAP.json

File renamed without changes.

‎docs/schema_branch.json‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,15 @@
9292
"default": false,
9393
"description": "If true, generates a table before simulation start with black-oil fluid compressibilities and derivatives for declared production-line fluids using reduced P and T. The compressibility factor is then estimated by interpolation at each iteration, which can significantly reduce simulation time, especially in transient runs."
9494
},
95-
"sensitivityAnalysis": {
95+
"parametricAnalysis": {
9696
"type": "boolean",
9797
"default": false,
98-
"description": "If true, runs steady-state sensitivity analysis using the 'leituraAS.json' file."
98+
"description": "If true, runs steady-state parametric analysis using the 'leituraAP.json' file."
99+
},
100+
"parametricAnalysisFile": {
101+
"type": "string",
102+
"default": "leituraAP.json",
103+
"description": "Name of the JSON file for parametric analysis (valid when parametricAnalysis == true)."
99104
},
100105
"trackGOR": {
101106
"type": "boolean",
@@ -325,10 +330,10 @@
325330
"unit": "m",
326331
"default": 0
327332
},
328-
"parallelizeSA": {
333+
"parallelizePA": {
329334
"type": "boolean",
330335
"default": false,
331-
"description": "If true, runs sensitivity analysis (SA) in parallel."
336+
"description": "If true, runs parametric analysis (PA) in parallel."
332337
},
333338
"diffusion3dMode": {
334339
"type": "boolean",

‎docs/schema_tramo.json‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,15 @@
8383
"default": false,
8484
"description": "Se true, antes do início da simulação, gera uma tabela com as compressibilidades e suas derivadas dos fluidos black oil da linha de produção declarados utilizando P e T reduzidas. O fator de compressibilidade é estimado por meio de interpolações dessa tabela a cada iteração, o que pode reduzir significativamente o tempo de simulação, especialmente a transiente."
8585
},
86-
"AS": {
86+
"AP": {
8787
"type": "boolean",
8888
"default": false,
89-
"description": "Se true, efetua análise de sensibilidade para o regime permanente a partir do arquivo 'leituraAS.json'."
89+
"description": "Se true, efetua análise paramétrica para o regime permanente a partir do arquivo 'leituraAP.json'."
90+
},
91+
"arquivoAP": {
92+
"type": "string",
93+
"description": "Nome do arquivo JSON de leitura para análise paramétrica (válido quando AP == true).",
94+
"default": "leituraAP.json"
9095
},
9196
"trackRgo": {
9297
"type": "boolean",
@@ -295,10 +300,10 @@
295300
"unit": "m",
296301
"default": 0
297302
},
298-
"paralelizaAS": {
303+
"paralelizaAP": {
299304
"type": "boolean",
300305
"default": false,
301-
"description": "Se true, paraleliza a análise de sensibilidade (AS)."
306+
"description": "Se true, paraleliza a análise paramétrica (AP)."
302307
},
303308
"modoDifus3D": {
304309
"type": "boolean",

‎marlim3/translations.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,9 @@
110110
"cpModel": "modeloCp",
111111
"jtlModel": "modeloJTL",
112112
"pressureTable": "tabP",
113-
"sensitivityAnalysis": "AS",
114-
"parallelizeSA": "paralelizaAS",
113+
"parametricAnalysis": "AP",
114+
"parametricAnalysisFile": "arquivoAP",
115+
"parallelizePA": "paralelizaAP",
115116
"trackGOR": "trackRgo",
116117
"trackGasDensity": "trackDensidadeGas",
117118
"freeGasDensityCorrectionBO": "correcaoDenGasLivreBlackOil",

‎src/core/JSON_entrada.cpp‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,9 @@ JSON_entrada_configuracaoInicial::JSON_entrada_configuracaoInicial(){
339339
contents["modeloCp"] = make_shared<JSON_entrada_configuracaoInicial_modeloCp>();
340340
contents["modeloJTL"] = make_shared<JSON_entrada_configuracaoInicial_modeloJTL>();
341341
contents["tabP"] = make_shared<JSON_entrada_configuracaoInicial_tabP>();
342-
contents["AS"] = make_shared<JSON_entrada_configuracaoInicial_AS>();
343-
contents["paralelizaAS"] = make_shared<JSON_entrada_configuracaoInicial_paralelizaAS>();
342+
contents["AP"] = make_shared<JSON_entrada_configuracaoInicial_AP>();
343+
contents["paralelizaAP"] = make_shared<JSON_entrada_configuracaoInicial_paralelizaAP>();
344+
contents["arquivoAP"] = make_shared<JSON_entrada_configuracaoInicial_arquivoAP>();
344345
contents["trackRgo"] = make_shared<JSON_entrada_configuracaoInicial_trackRgo>();
345346
contents["trackDensidadeGas"] = make_shared<JSON_entrada_configuracaoInicial_trackDensidadeGas>();
346347
contents["correcaoDenGasLivreBlackOil"] = make_shared<JSON_entrada_configuracaoInicial_correcaoDenGasLivreBlackOil>();
@@ -445,12 +446,16 @@ JSON_entrada_configuracaoInicial_tabP& JSON_entrada_configuracaoInicial::tabP(){
445446
return static_cast<JSON_entrada_configuracaoInicial_tabP&>(*contents["tabP"].get());
446447
}
447448

448-
JSON_entrada_configuracaoInicial_AS& JSON_entrada_configuracaoInicial::AS(){
449-
return static_cast<JSON_entrada_configuracaoInicial_AS&>(*contents["AS"].get());
449+
JSON_entrada_configuracaoInicial_AP& JSON_entrada_configuracaoInicial::AP(){
450+
return static_cast<JSON_entrada_configuracaoInicial_AP&>(*contents["AP"].get());
450451
}
451452

452-
JSON_entrada_configuracaoInicial_paralelizaAS& JSON_entrada_configuracaoInicial::paralelizaAS(){
453-
return static_cast<JSON_entrada_configuracaoInicial_paralelizaAS&>(*contents["paralelizaAS"].get());
453+
JSON_entrada_configuracaoInicial_paralelizaAP& JSON_entrada_configuracaoInicial::paralelizaAP(){
454+
return static_cast<JSON_entrada_configuracaoInicial_paralelizaAP&>(*contents["paralelizaAP"].get());
455+
}
456+
457+
JSON_entrada_configuracaoInicial_arquivoAP& JSON_entrada_configuracaoInicial::arquivoAP(){
458+
return static_cast<JSON_entrada_configuracaoInicial_arquivoAP&>(*contents["arquivoAP"].get());
454459
}
455460

456461
JSON_entrada_configuracaoInicial_trackRgo& JSON_entrada_configuracaoInicial::trackRgo(){

0 commit comments

Comments
 (0)