source: issm/oecreview/Archive/16554-17801/ISSM-16689-16690.diff

Last change on this file was 17802, checked in by Mathieu Morlighem, 11 years ago

Added archives
File size: 2.8 KB
RevLine 
[17802]1Index: ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp
2===================================================================
3--- ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 16689)
4+++ ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 16690)
5@@ -91,17 +91,6 @@
6
7 }/*}}}*/
8 void HydrologyDCEfficientAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
9-
10- /*Do we really want DC?*/
11- int hydrology_model;
12- iomodel->Constant(&hydrology_model,HydrologyModelEnum);
13- if(hydrology_model!=HydrologydcEnum) return;
14-
15- /*Do we want an efficient layer*/
16- bool isefficientlayer;
17- iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
18- if(!isefficientlayer) return;
19-
20 /*Nothing for now*/
21 }/*}}}*/
22
23Index: ../trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp
24===================================================================
25--- ../trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 16689)
26+++ ../trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 16690)
27@@ -12,6 +12,17 @@
28 }/*}}}*/
29 void L2ProjectionEPLAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
30
31+ bool isefficientlayer;
32+ int hydrology_model;
33+
34+ /*Now, do we really want DC?*/
35+ iomodel->Constant(&hydrology_model,HydrologyModelEnum);
36+ if(hydrology_model!=HydrologydcEnum) return;
37+
38+ /*Do we want an efficient layer*/
39+ iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
40+ if(!isefficientlayer) return;
41+
42 /*Update elements: */
43 int counter=0;
44 for(int i=0;i<iomodel->numberofelements;i++){
45@@ -29,7 +40,16 @@
46 }
47 }/*}}}*/
48 void L2ProjectionEPLAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
49+ /*Now, do we really want DC?*/
50+ int hydrology_model;
51+ iomodel->Constant(&hydrology_model,HydrologyModelEnum);
52+ if(hydrology_model!=HydrologydcEnum) return;
53
54+ /*Do we want an efficient layer*/
55+ bool isefficientlayer;
56+ iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
57+ if(!isefficientlayer) return;
58+
59 if(iomodel->meshtype==Mesh3DEnum){
60 iomodel->FetchData(1,MeshVertexonbedEnum);
61 }
62Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
63===================================================================
64--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16689)
65+++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16690)
66@@ -10818,8 +10818,6 @@
67 /*And proceed to the real thing*/
68 thickness[i] = old_thickness[i]*(1+((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*pow(EPLgrad,2.0)-2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n)));
69 thickness[i+numdof2d]=thickness[i];
70- printf("N, %e - thick term2, %e \n",EPL_N,-2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n)));
71- printf("old thick, %e - thick , %e \n",old_thickness[i],thickness[i]);
72 }
73 }
74 penta=this;
Note: See TracBrowser for help on using the repository browser.