Changeset 10300

Timestamp:

10/25/11 15:44:55 (13 years ago)

Author:

seroussi

Message:

minor grounding line

Location:

issm/trunk/src/c

Files:

• Container/DataSet.cpp (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (moved) (moved from issm/trunk/src/c/modules/GroundinglineMigrationx/GroundingLineMigrationx.cpp ) (2 diffs)
• modules/GroundinglineMigrationx/GroundinglineMigrationx.h (moved) (moved from issm/trunk/src/c/modules/GroundinglineMigrationx/GroundingLineMigrationx.h ) (2 diffs)
• modules/GroundinglineMigrationx/GroundinglineMigrationxLocal.h (moved) (moved from issm/trunk/src/c/modules/GroundinglineMigrationx/GroundingLineMigrationxLocal.h ) (2 diffs)
• modules/GroundinglineMigrationx/GroundinglineMigrationxUtils.cpp (moved) (moved from issm/trunk/src/c/modules/GroundinglineMigrationx/GroundingLineMigrationxUtils.cpp ) (2 diffs)
• solutions/transient_core.cpp (modified) (4 diffs)

issm/trunk/src/c/Container/DataSet.cpp

@@ -388 +388 @@
                                 dataset->AddObject(doubleexternalresult);}
                                 break;
+                        #ifdef _HAVE_GROUNDINGLINE_
+                        case BoolElementResultEnum:{
+                                BoolElementResult* boolelementresult=NULL;
+                                boolelementresult=new BoolElementResult();
+                                boolelementresult->Demarshall(&marshalled_dataset);
+                                dataset->AddObject(boolelementresult);}
+                                break;
+                        #endif
                         default:
                                 _error_("could not recognize enum type: %s",EnumToStringx(enum_type));

issm/trunk/src/c/Makefile.am

@@ -535 +535 @@
                                           ./solutions/bedslope_core.cpp
 #}}}
-#GroundingLine sources  {{{1
-groundingline_sources= ./modules/GroundingLineMigrationx/GroundingLineMigrationx.cpp\
-                                           ./modules/GroundingLineMigrationx/GroundingLineMigrationx.h\
-                                           ./modules/GroundingLineMigrationx/GroundingLineMigrationxLocal.h\
-                                           ./modules/GroundingLineMigrationx/GroundingLineMigrationxUtils.cpp
+#Groundingline sources  {{{1
+groundingline_sources= ./modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp\
+                                           ./modules/GroundinglineMigrationx/GroundinglineMigrationx.h\
+                                           ./modules/GroundinglineMigrationx/GroundinglineMigrationxLocal.h\
+                                           ./modules/GroundinglineMigrationx/GroundinglineMigrationxUtils.cpp
 #}}}
 #Rifts sources  {{{1

issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

@@ -1 @@
-/*!\file GroundingLineMigrationx
+/*!\file GroundinglineMigrationx
  * \brief: migration grounding line position.
  */
 
-#include "./GroundingLineMigrationx.h"
-#include "./GroundingLineMigrationxLocal.h"
+#include "./GroundinglineMigrationx.h"
+#include "./GroundinglineMigrationxLocal.h"
 
 #include "../../shared/shared.h"
@@ -14 +14 @@
 #include "../../Container/Container.h"
 
-void GroundingLineMigrationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){
+void GroundinglineMigrationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){
 
         int migration_style;

issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.h

@@ -1 @@
-/*!\file:  GroundingLineMigrationx.h
+/*!\file:  GroundinglineMigrationx.h
  * \brief header file for Grounding Line Migration
  */ 
@@ -9 +9 @@
 
 /* local prototypes: */
-void GroundingLineMigrationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters);
+void GroundinglineMigrationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters);
 
 #endif  /* _GROUNDINGLINEMIGRATIONX_H */

issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationxLocal.h

@@ -1 @@
-/*!\file:  GroundingLineMigrationxLocal.h
+/*!\file:  GroundinglineMigrationxLocal.h
  * \brief local header file for Grounding Line Migration
  */ 
@@ -15 +15 @@
 double*    PotentialSheetUngrounding(Elements* elements,Nodes* nodes,Parameters* parameters);
 double*    PropagateShelfIntoConnexIceSheet(Elements* elements,Nodes* nodes,Parameters* parameters,double* potential_sheet_ungrounding);
-bool*      CreateElementOnGroundingLine(Elements* elements,double* element_on_iceshelf);
+bool*      CreateElementOnGroundingline(Elements* elements,double* element_on_iceshelf);
 double*    CreateElementOnIceShelf(Elements* elements);
 double*    CreateElementTouchingIceShelf(Elements* elements,Vec vec_nodes_on_iceshelf);

issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationxUtils.cpp

@@ -1 @@
-/*!\file GroundingLineMigrationx
+/*!\file GroundinglineMigrationx
  * \brief: migration grounding line position.
  */
 
-#include "./GroundingLineMigrationx.h"
-#include "./GroundingLineMigrationxLocal.h"
+#include "./GroundinglineMigrationx.h"
+#include "./GroundinglineMigrationxLocal.h"
 #include "../../shared/shared.h"
 #include "../../io/io.h"
@@ -168 +168 @@
 }
 /*}}}*/
-/*FUNCTION CreateElementOnGroundingLine {{{1*/
-bool*      CreateElementOnGroundingLine(Elements* elements,double* element_on_iceshelf){ 
+/*FUNCTION CreateElementOnGroundingnine {{{1*/
+bool*      CreateElementOnGroundingline(Elements* elements,double* element_on_iceshelf){ 
 
         int      i;

issm/trunk/src/c/solutions/transient_core.cpp

@@ -24 +24 @@
         /*parameters: */
         double finaltime,dt,yts;
-        bool   control_analysis,isdiagnostic,isprognostic,isthermal;
+        bool   control_analysis,isdiagnostic,isprognostic,isthermal,isgroundingline;
         bool   time_adapt=false;
         int    solution_type;
@@ -45 +45 @@
         femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum);
         femmodel->parameters->FindParam(&time_adapt,TimesteppingTimeAdaptEnum);
-        femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum);
         femmodel->parameters->FindParam(&isdiagnostic,TransientIsdiagnosticEnum);
         femmodel->parameters->FindParam(&isprognostic,TransientIsprognosticEnum);
         femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum);
+        femmodel->parameters->FindParam(&isgroundingline,TransientIsgroundinglineEnum);
+        if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum);
         femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum);
         if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,TransientRequestedOutputsEnum);
@@ -86 +87 @@
                         _error_("ISSM was not compiled with diagnostic capabilities. Exiting");
                         #endif
-
                 }
 
@@ -96 +96 @@
                 }
 
-                if (groundingline_migration!=NoneEnum){
+                if(isgroundingline){
                         if(dim==3) _error_("Grounding line migration not implemented in 3d");
                         _printf_(VerboseSolution(),"   computing new grounding line position\n");
-                        #ifdef _HAVE_DIAGNOSTIC_
-                        GroundingLineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+                        #ifdef _HAVE_GROUNDINGLINE_
+                        GroundinglineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
                         #else
                         _error_("ISSM was not compiled with grounding line migration capabilities. Exiting");
                         #endif
-
                 }