Changeset 23373

Timestamp:

10/02/18 14:14:02 (6 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing AD compilation and many other tests

Location:

issm/trunk-jpl/src/c/analyses

Files:

• HydrologyDCEfficientAnalysis.cpp (modified) (2 diffs)
• HydrologyDCInefficientAnalysis.cpp (modified) (21 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -607 +607 @@
                                 //thickness[i] = old_thickness[i]*(1.0+opening-closing)/(1.0-opening+closing);
 
-                                if(element->nodes[i]->Sid()==2299){
-                                        printf("for node %i \n",element->nodes[i]->Sid());
-                                        printf(" old thickness is  %g \n",old_thickness[i]);
-                                        printf(" new thickness is  %g \n",thickness[i]);
-                                }
+                                //if(element->nodes[i]->Sid()==2299){
+                                //      printf("for node %i \n",element->nodes[i]->Sid());
+                                //      printf(" old thickness is  %g \n",old_thickness[i]);
+                                //      printf(" new thickness is  %g \n",thickness[i]);
+                                //}
                                 /*Take care of otherthikening*/
                                 if(thickness[i]>max_thick){
@@ -710 +710 @@
                         /* If epl thickness gets under colapse thickness, close the layer */
                         if(epl_thickness[i]<colapse_thick){
-                                if(element->nodes[i]->Sid()==2299){
-                                        printf("masking node %i with thickness %f\n",element->nodes[i]->Sid(),epl_thickness[i]);}
+                                //if(element->nodes[i]->Sid()==2299){
+                                        //printf("masking node %i with thickness %f\n",element->nodes[i]->Sid(),epl_thickness[i]);}
                                 vec_mask->SetValue(basalelement->nodes[i]->Sid(),0.,INS_VAL);
                                 recurence->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL);

issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

@@ -10 +10 @@
         return 1;
 }/*}}}*/
-
 void HydrologyDCInefficientAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
 
@@ -29 +28 @@
 
         /*retrieve some parameters: */
-        /* bool   issmb; */
-        /* iomodel->FindConstant(&issmb,"md.transient.issmb"); */
+         bool   issmb;
+        iomodel->FindConstant(&issmb,"md.transient.issmb");
         iomodel->FindConstant(&hydrology_model,"md.hydrology.model");
 
@@ -65 +64 @@
                 parameters->AddObject(new DoubleParam(HydrologydcSedimentlimitEnum,sedimentlimit));
         }
-        /* if(!issmb){ */
-        /*      parameters->AddObject(iomodel->CopyConstantObject("md.smb.model",SmbEnum)); */
-        /* } */
+        if(!issmb){
+                parameters->AddObject(iomodel->CopyConstantObject("md.smb.model",SmbEnum));
+        }
 
   /*Requested outputs*/
@@ -75 +74 @@
   iomodel->DeleteData(&requestedoutputs,numoutputs,"md.hydrology.requested_outputs");
 }/*}}}*/
-
 void HydrologyDCInefficientAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
 
@@ -83 +81 @@
         /*Fetch data needed: */
         iomodel->FindConstant(&hydrology_model,"md.hydrology.model");
-        bool   issmb;
-        iomodel->FindConstant(&issmb,"md.transient.issmb");
 
         /*Now, do we really want DC?*/
@@ -117 +113 @@
                 iomodel->FetchDataToInput(elements,"md.initialization.epl_head",EplHeadHydrostepEnum);
         }
-        if(!issmb){
-                iomodel->FetchDataToInput(elements,"md.smb.model",SmbEnum);
-}
-
-}/*}}}*/
-
+
+}/*}}}*/
 void HydrologyDCInefficientAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
 
@@ -138 +130 @@
         iomodel->DeleteData(2,"md.mesh.vertexonbase","md.mesh.vertexonsurface");
 }/*}}}*/
-
 void HydrologyDCInefficientAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
 
@@ -148 +139 @@
         IoModelToConstraintsx(constraints,iomodel,"md.hydrology.spcsediment_head",HydrologyDCInefficientAnalysisEnum,P1Enum);
 }/*}}}*/
-
 void HydrologyDCInefficientAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
 
@@ -183 +173 @@
         _error_("not implemented");
 }/*}}}*/
-
 ElementVector* HydrologyDCInefficientAnalysis::CreateDVector(Element* element){/*{{{*/
         /*Default, return NULL*/
         return NULL;
 }/*}}}*/
-
 ElementMatrix* HydrologyDCInefficientAnalysis::CreateJacobianMatrix(Element* element){/*{{{*/
 _error_("Not implemented");
 }/*}}}*/
-
 ElementMatrix* HydrologyDCInefficientAnalysis::CreateKMatrix(Element* element){/*{{{*/
 
@@ -318 +305 @@
         return Ke;
 }/*}}}*/
-
 ElementVector* HydrologyDCInefficientAnalysis::CreatePVector(Element* element){/*{{{*/
 
@@ -464 +450 @@
         return pe;
 }/*}}}*/
-
 void HydrologyDCInefficientAnalysis::GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
         /*Compute B  matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2.
@@ -492 +477 @@
         xDelete<IssmDouble>(dbasis);
 }/*}}}*/
-
 void HydrologyDCInefficientAnalysis::GetSolutionFromInputs(Vector<IssmDouble>* solution,Element* element){/*{{{*/
         element->GetSolutionFromInputsOneDof(solution,SedimentHeadHydrostepEnum);
 }/*}}}*/
-
 void HydrologyDCInefficientAnalysis::GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index){/*{{{*/
         _error_("Not implemented yet");
 }/*}}}*/
-
 void HydrologyDCInefficientAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
 
@@ -595 +577 @@
         }
 }/*}}}*/
-
 void HydrologyDCInefficientAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
         /*Default, do nothing*/
         return;
 }/*}}}*/
-
 IssmDouble HydrologyDCInefficientAnalysis::SedimentStoring(Element* element,Gauss* gauss,Input* sed_head_input, Input* base_input){/*{{{*/
         int unconf_scheme;
@@ -640 +620 @@
         return sediment_storing;
 }/*}}}*/
-
 IssmDouble HydrologyDCInefficientAnalysis::SedimentTransmitivity(Element* element,Gauss* gauss,Input* sed_head_input, Input* base_input,Input* SedTrans_input){/*{{{*/
         int unconf_scheme;
@@ -675 +654 @@
         return sediment_transmitivity;
 }/*}}}*/
-
 void  HydrologyDCInefficientAnalysis::GetHydrologyDCInefficientHmax(IssmDouble* ph_max,Element* element, Node* innode){/*{{{*/
 
@@ -711 +689 @@
 }
 /*}}}*/
-
 IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyKMatrixTransfer(Element* element){/*{{{*/
 
@@ -733 +710 @@
         return transfer;
 }/*}}}*/
-
 IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input* epl_head_input){/*{{{*/
 
@@ -758 +734 @@
         return transfer;
 }/*}}}*/
-
 void HydrologyDCInefficientAnalysis::ElementizeEplMask(FemModel* femmodel){/*{{{*/
 
@@ -777 +752 @@
         }
 }/*}}}*/
-
-void  HydrologyDCInefficientAnalysis::HydrologyIDSGetMask(Vector<IssmDouble>* vec_mask, Element* element){
+void  HydrologyDCInefficientAnalysis::HydrologyIDSGetMask(Vector<IssmDouble>* vec_mask, Element* element){/*{{{*/
         bool        active_element;
         int         domaintype;
@@ -819 +793 @@
         xDelete<IssmDouble>(meltingrate);
         xDelete<IssmDouble>(groundedice);
-}
+}/*}}}*/
 void HydrologyDCInefficientAnalysis::ElementizeIdsMask(FemModel* femmodel){/*{{{*/
 
@@ -838 +812 @@
         }
 }/*}}}*/
-
 void HydrologyDCInefficientAnalysis::HydrologyIdsGetActive(Vector<IssmDouble>* active_vec, Element* element){/*{{{*/
         /*Constants*/