source: issm/oecreview/Archive/21337-21723/ISSM-21718-21719.diff@ 21726

Last change on this file since 21726 was 21726, checked in by Mathieu Morlighem, 8 years ago

CHG added Archive/21337-21723
File size: 3.5 KB
RevLine 
[21726]1Index: ../trunk-jpl/src/c/cores/depthaverage_core.cpp
2===================================================================
3--- ../trunk-jpl/src/c/cores/depthaverage_core.cpp (revision 21718)
4+++ ../trunk-jpl/src/c/cores/depthaverage_core.cpp (revision 21719)
5@@ -13,21 +13,24 @@
6
7 /*Intermediaries*/
8 int domaintype,elementtype;
9+ int inputenum,input_average_enum;
10
11 if(VerboseSolution()) _printf0_("depth averaging solution...\n");
12
13 /*Get parameters*/
14 femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
15 femmodel->parameters->FindParam(&elementtype,MeshElementtypeEnum);
16+ femmodel->parameters->FindParam(&inputenum,InputToDepthaverageInEnum);
17+ femmodel->parameters->FindParam(&input_average_enum,InputToDepthaverageOutEnum);
18
19- /*If this is a 2D horizontal domain, return (no need to extrude)*/
20- if(domaintype==Domain2DhorizontalEnum) return;
21+ /*If this is a 2D horizontal domain: no need to do anything, just copy input*/
22+ if(domaintype==Domain2DhorizontalEnum){
23+ InputDuplicatex(femmodel,inputenum,input_average_enum);
24+ return;
25+ }
26
27 /*Special method for Penta, otherwise call solution sequence*/
28 if(elementtype==PentaEnum){
29- int inputenum,input_average_enum;
30- femmodel->parameters->FindParam(&inputenum,InputToDepthaverageInEnum);
31- femmodel->parameters->FindParam(&input_average_enum,InputToDepthaverageOutEnum);
32 InputDepthAverageAtBasex(femmodel,inputenum,input_average_enum);
33 }
34 else{
35Index: ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp
36===================================================================
37--- ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 21718)
38+++ ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 21719)
39@@ -266,22 +266,10 @@
40 element->FindParam(&dt,TimesteppingTimeStepEnum);
41 element->FindParam(&domaintype,DomainTypeEnum);
42 element->FindParam(&stabilization,MasstransportStabilizationEnum);
43- Input* vxaverage_input=NULL;
44+ Input* vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input);
45 Input* vyaverage_input=NULL;
46- if(domaintype==Domain2DhorizontalEnum){
47- vxaverage_input=element->GetInput(VxEnum); _assert_(vxaverage_input);
48- vyaverage_input=element->GetInput(VyEnum); _assert_(vyaverage_input);
49- }
50- else{
51- if(dim==1){
52- vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input);
53- }
54- if(dim==2){
55- vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input);
56- vyaverage_input=element->GetInput(VyAverageEnum); _assert_(vyaverage_input);
57- }
58+ if(dim==2) vyaverage_input=element->GetInput(VyAverageEnum); _assert_(vyaverage_input);
59
60- }
61 h = element->CharacteristicLength();
62
63 /* Start looping on the number of gaussian points: */
64@@ -405,16 +393,8 @@
65 element->GetVerticesCoordinates(&xyz_list);
66 element->FindParam(&dt,TimesteppingTimeStepEnum);
67 element->FindParam(&domaintype,DomainTypeEnum);
68- Input* vxaverage_input=NULL;
69- Input* vyaverage_input=NULL;
70- if(domaintype==Domain2DhorizontalEnum){
71- vxaverage_input=element->GetInput(VxEnum); _assert_(vxaverage_input);
72- vyaverage_input=element->GetInput(VyEnum); _assert_(vyaverage_input);
73- }
74- else{
75- vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input);
76- vyaverage_input=element->GetInput(VyAverageEnum); _assert_(vyaverage_input);
77- }
78+ Input* vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input);
79+ Input* vyaverage_input=element->GetInput(VyAverageEnum); _assert_(vyaverage_input);
80
81 /* Start looping on the number of gaussian points: */
82 Gauss* gauss=element->NewGauss(2);
Note: See TracBrowser for help on using the repository browser.