Changeset 24994

Timestamp:

06/10/20 02:16:15 (5 years ago)

Author:

bdef

Message:

CHG:updating analysis list build for Hydro

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (8 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -710 +710 @@
                         break;
 
-                case HydrologySolutionEnum:
-                        analyses_temp[numanalyses++]=HydrologyShreveAnalysisEnum;
-                        analyses_temp[numanalyses++]=HydrologyDCInefficientAnalysisEnum;
-                        analyses_temp[numanalyses++]=HydrologyDCEfficientAnalysisEnum;
-                        analyses_temp[numanalyses++]=L2ProjectionBaseAnalysisEnum;
-                        analyses_temp[numanalyses++]=L2ProjectionEPLAnalysisEnum;
+                case HydrologySolutionEnum:{
+                        int hydrology_model;
+                        iomodel->FindConstant(&hydrology_model,"md.hydrology.model");
+                        if(hydrology_model==HydrologyshreveEnum){
+                                analyses_temp[numanalyses++]=HydrologyShreveAnalysisEnum;
+                        }
+                        else if(hydrology_model==HydrologyGlaDSEnum){
+                                analyses_temp[numanalyses++]=HydrologyGlaDSAnalysisEnum;
+                        }
+                        if(hydrology_model==HydrologyshaktiEnum){
+                                analyses_temp[numanalyses++]=HydrologyShaktiAnalysisEnum;
+                        }
+                        if(hydrology_model==HydrologypismEnum){
+                                analyses_temp[numanalyses++]=HydrologyPismAnalysisEnum;
+                        }
+                        if(hydrology_model==HydrologydcEnum){
+                                analyses_temp[numanalyses++]=HydrologyDCInefficientAnalysisEnum;
+                                analyses_temp[numanalyses++]=HydrologyDCEfficientAnalysisEnum;
+                                analyses_temp[numanalyses++]=L2ProjectionEPLAnalysisEnum;
+                                analyses_temp[numanalyses++]=L2ProjectionBaseAnalysisEnum;
+                        }
+                }
                         break;
 
@@ -821 +837 @@
                         }
                         if(ishydrology){
-                                analyses_temp[numanalyses++]=HydrologyShreveAnalysisEnum;
-                                analyses_temp[numanalyses++]=HydrologyGlaDSAnalysisEnum;
-                                analyses_temp[numanalyses++]=HydrologyShaktiAnalysisEnum;
-                                analyses_temp[numanalyses++]=HydrologyPismAnalysisEnum;
-                                analyses_temp[numanalyses++]=HydrologyDCInefficientAnalysisEnum;
-                                analyses_temp[numanalyses++]=HydrologyDCEfficientAnalysisEnum;
-                                analyses_temp[numanalyses++]=L2ProjectionEPLAnalysisEnum;
+                                SolutionAnalysesList(&analyses_iter,&num_analyses_iter,iomodel,HydrologySolutionEnum);
+            xMemCpy<int>(&analyses_temp[numanalyses],analyses_iter,num_analyses_iter);
+                                numanalyses+=num_analyses_iter; xDelete<int>(analyses_iter);
                         }
                         if(isdamage){
@@ -4698 +4710 @@
         pRSLgi->SetValues(gsize,indices,RSLgi,ADD_VAL);
         pRSLgi->Assemble();
-        
+
         /*Sum all eustatic components from all cpus:*/
         ISSM_MPI_Reduce (&eustatic_cpu,&eustatic,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
@@ -4730 +4742 @@
         this->parameters->FindParam(&computeelastic,SealevelriseElasticEnum);
 
-        /*Initialize temporary vector that will be used to sum eustatic components on all local elements, prior 
+        /*Initialize temporary vector that will be used to sum eustatic components on all local elements, prior
          * to assembly:*/
         gsize = this->nodes->NumberOfDofs(GsetEnum);
@@ -4804 +4816 @@
 
         /*recover lat,long and radius vectors from vertices: */
-        VertexCoordinatesx(&latitude,&longitude,&radius,this->vertices,spherical); 
+        VertexCoordinatesx(&latitude,&longitude,&radius,this->vertices,spherical);
 
         /* Green's function (1+k_2-h_2/g): checked against Glenn Milne's thesis Chapter 3 (eqs: 3.3-4, 3.10-11)
@@ -4853 +4865 @@
         int  gsize;
         int  horiz;
-        
+
         /*retrieve parameters:*/
         this->parameters->FindParam(&horiz,SealevelriseHorizEnum);
@@ -4860 +4872 @@
         RSLg=pRSLg->ToMPISerial();
 
-        /*Initialize temporary vector that will be used to sum eustatic components on all local elements, prior 
+        /*Initialize temporary vector that will be used to sum eustatic components on all local elements, prior
          * to assembly:*/
         gsize = this->nodes->NumberOfDofs(GsetEnum);
@@ -4911 +4923 @@
                 oceanvalue_cpu += element->OceanAverage(RSLg_serial,masks);
         }
-        
+
         ISSM_MPI_Reduce (&oceanvalue_cpu,&oceanvalue,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,0,IssmComm::GetComm() );
         ISSM_MPI_Bcast(&oceanvalue,1,ISSM_MPI_DOUBLE,0,IssmComm::GetComm());