Changeset 23399

Timestamp:

10/07/18 00:27:55 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor

Location:

issm/trunk-jpl/src/c/modules/ModelProcessorx

Files:

• ModelProcessorx.cpp (modified) (6 diffs)
• ModelProcessorx.h (modified) (1 diff)
• Transient/UpdateElementsTransient.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

@@ -15 +15 @@
 void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters,IoModel* iomodel,FILE* toolkitfile, char* rootpath,const int solution_enum,const int nummodels,const int* analysis_enum_list){
 
-        int   i,analysis_enum,verbose;
+        /*Set Verbosity once for all*/
+        int verbose;
+        iomodel->FindConstant(&verbose,"md.verbose");
+        SetVerbosityLevel(verbose);
+
+        /*Some sanity checks*/
+        _assert_(nummodels>0);
 
         /*Initialize datasets*/
@@ -26 +32 @@
         Parameters  *parameters  = new Parameters();
 
-        /*Fetch parameters: */
-        iomodel->FindConstant(&verbose,"md.verbose");
-        SetVerbosityLevel(verbose);
 
         if(VerboseMProcessor()) _printf0_("   starting model processor \n");
@@ -41 +44 @@
         CreateParameters(parameters,iomodel,rootpath,toolkitfile,solution_enum);
 
-        for(i=0;i<nummodels;i++){
+        for(int i=0;i<nummodels;i++){
 
-                analysis_enum=analysis_enum_list[i];
+                int analysis_enum=analysis_enum_list[i];
                 parameters->AddObject(new IntParam(AnalysisCounterEnum,i));
 
@@ -73 +76 @@
         UpdateElementsAndMaterialsDakota(elements,materials,iomodel);
         #endif
-        if(solution_enum==TransientSolutionEnum){
-                UpdateElementsTransient(elements,parameters,iomodel,analysis_enum);
-        }
+        if(solution_enum==TransientSolutionEnum) UpdateElementsTransient(elements,parameters,iomodel);
 
         /*Output definitions dataset: */
@@ -90 +91 @@
         loads->Presort();
         materials->Presort();
-
         constraints->Presort();
-        if(VerboseMProcessor()) _printf0_("   done with model processor \n");
 
         /*Assign output pointers:*/
@@ -102 +101 @@
         *ploads       = loads;
         *pparameters  = parameters;
+
+        if(VerboseMProcessor()) _printf0_("   done with model processor \n");
 }

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h

@@ -21 +21 @@
 void UpdateElementsAndMaterialsControlAD(Elements* elements,Parameters* parameters,Materials* materials, IoModel* iomodel);
 void UpdateElementsAndMaterialsDakota(Elements* elements,Materials* materials, IoModel* iomodel);
-void UpdateElementsTransient(Elements* elements,Parameters* parameters,IoModel* iomodel,int analysis_type);
+void UpdateElementsTransient(Elements* elements,Parameters* parameters,IoModel* iomodel);
 void CreateNodes(Nodes*nodes, IoModel* iomodel,int analysis,int finite_element,int approximation=NoneApproximationEnum);
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp

@@ -9 +9 @@
 #include "../ModelProcessorx.h"
 
-void    UpdateElementsTransient(Elements* elements, Parameters* parameters,IoModel* iomodel,int analysis_type){
+void    UpdateElementsTransient(Elements* elements, Parameters* parameters,IoModel* iomodel){
+
+        /*FIXME: this should go into parameterization update*/
 
         bool isgroundingline;