Changeset 614

Timestamp:

05/27/09 15:16:44 (15 years ago)

Author:

Mathieu Morlighem

Message:

do not overwrite analysis_types if char*=NULL

Location:

issm/trunk/src/c/parallel

Files:

• CreateFemModel.cpp (modified) (1 diff)
• diagnostic.cpp (modified) (1 diff)
• thermal.cpp (modified) (1 diff)

issm/trunk/src/c/parallel/CreateFemModel.cpp

@@ -36 +36 @@
 
         _printf_("   specifying analysis\n");
-        //specify analysis_type
-        model->analysis_type=(char*)xmalloc((strlen(analysis_type)+1)*sizeof(char)); strcpy(model->analysis_type,analysis_type);
-        //specify sub_analysis_type EXCEPT if thermal: we do not know if it is transient or steady yet (only the model knows)!!
-        if (strcmp(analysis_type,"thermal")!=0){
+        if (analysis_type!=NULL){
+                model->analysis_type=(char*)xmalloc((strlen(analysis_type)+1)*sizeof(char)); strcpy(model->analysis_type,analysis_type);
+        }
+        if (sub_analysis_type!=NULL){
                 model->sub_analysis_type=(char*)xmalloc((strlen(sub_analysis_type)+1)*sizeof(char)); strcpy(model->sub_analysis_type,sub_analysis_type);
         }

issm/trunk/src/c/parallel/diagnostic.cpp

@@ -98 +98 @@
                 _printf_("calling qmu analysis on diagnostic core:\n");
                 
-                qmu(qmuname,&femmodels[0],inputs,DiagnosticAnalysisEnum(),NoneAnalysisEnum());
         }
 

issm/trunk/src/c/parallel/thermal.cpp

@@ -69 +69 @@
 
         _printf_("read and create thermal finite element model:\n");
-        CreateFemModel(&femmodels[0],fid,"thermal","");
+        CreateFemModel(&femmodels[0],fid,"thermal",NULL);
         _printf_("read and create melting finite element model:\n");
-        CreateFemModel(&femmodels[1],fid,"melting","");
+        CreateFemModel(&femmodels[1],fid,"melting",NULL);
 
         _printf_("initialize inputs:\n");