Changeset 17075

Timestamp:

01/09/14 10:49:53 (11 years ago)

Author:

jbondzio

Message:

ADD: Shell for Level-Set Method

Location:

issm/trunk-jpl

Files:

• externalpackages/cython/install-19.2.sh (modified) (1 diff)
• externalpackages/git/install.sh (modified) (1 diff)
• externalpackages/nose/install-linux64-python2.sh (modified) (1 diff)
• externalpackages/petsc/install-3.4-linux64.sh (modified) (1 diff)
• externalpackages/python/install-2.7.3-linux64.sh (modified) (1 diff)
• externalpackages/scipy/install-linux64.sh (modified) (1 diff)
• src/c/Makefile.am (modified) (1 diff)
• src/c/analyses/EnumToAnalysis.cpp (modified) (1 diff)
• src/c/analyses/StressbalanceAnalysis.h (modified) (1 diff)
• src/c/analyses/analyses.h (modified) (1 diff)
• src/c/cores/AnalysisConfiguration.cpp (modified) (2 diffs)
• src/c/cores/transient_core.cpp (modified) (3 diffs)
• src/c/modules/ModelProcessorx/ModelProcessorx.cpp (modified) (3 diffs)
• src/c/shared/Enum/EnumDefinitions.h (modified) (2 diffs)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (2 diffs)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (2 diffs)
• src/m/classes/transient.m (modified) (5 diffs)
• src/m/classes/transient.py (modified) (5 diffs)
• src/m/dev/devpath.py (modified) (1 diff)
• src/m/enum/EnumDefinitions.py (modified) (2 diffs)

issm/trunk-jpl/externalpackages/cython/install-19.2.sh

@@ -4 +4 @@
 #clean up
 rm -rf Cython-0.19.2
+rm -rf cython.tar.gz
 
 #download numpy first

issm/trunk-jpl/externalpackages/git/install.sh

@@ -18 +18 @@
 #install
 cd src 
-./configure  --prefix="$ISSM_DIR/externalpackages/git/install"
-#--with-python="$ISSM_DIR/externalpackages/python/install/bin/python" #Do we really need this line?
+./configure  --prefix="$ISSM_DIR/externalpackages/git/install" \
+    --with-python="$ISSM_DIR/externalpackages/python/install/bin/python" #Do we really need this line?
         
 #Compile

issm/trunk-jpl/externalpackages/nose/install-linux64-python2.sh

@@ -11 +11 @@
 
 cd src
+export python=$ISSM_DIR/externalpackages/python/install/bin/python
+
 python ./setup.py build
 python ./setup.py install

issm/trunk-jpl/externalpackages/petsc/install-3.4-linux64.sh

@@ -21 +21 @@
         --PETSC_ARCH=linux-gnu-amd64 \
         --PETSC_DIR="$ISSM_DIR/externalpackages/petsc/src" \
-        --with-debugging=0 \
+        --with-debugging=1 \
         --with-shared-libraries=1 \
         --download-parmetis=yes \

issm/trunk-jpl/externalpackages/python/install-2.7.3-linux64.sh

@@ -19 +19 @@
 ./configure \
  --prefix="$ISSM_DIR/externalpackages/python/install" \
+ --with-zlib \
  --enable-shared
 

issm/trunk-jpl/externalpackages/scipy/install-linux64.sh

@@ -8 +8 @@
 export FFLAGS=-ff2c
 
+if [ -d "scipy" ]; then
 #clean up
-rm -rf scipy
-
+#rm -rf scipy
+echo "hello"
+else
 #download scipy
-export GIT_SSL_NO_VERIFY=true 
-git clone https://github.com/scipy/scipy.git
+    export GIT_SSL_NO_VERIFY=true 
+    git clone https://github.com/scipy/scipy.git
+fi
 
 #install scipy

issm/trunk-jpl/src/c/Makefile.am

@@ -369 +369 @@
 #Transient sources  {{{
 transient_sources  = ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp \
-                                                        ./cores/transient_core.cpp
+                                                        ./cores/transient_core.cpp\
+              ./analyses/LevelsetAnalysis.h\
+              ./analyses/LevelsetAnalysis.cpp
 #}}}
 #Steadystate sources  {{{

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

@@ -36 +36 @@
                 case ExtrudeFromTopAnalysisEnum : return new ExtrudeFromTopAnalysis();
                 case ThermalAnalysisEnum : return new ThermalAnalysis();
+          case LevelsetAnalysisEnum : return new LevelsetAnalysis();
                 #ifdef _HAVE_GIA_
                 case GiaAnalysisEnum : return new GiaAnalysis();

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.h

@@ -11 +11 @@
 class StressbalanceAnalysis: public Analysis{
 
-        public:
+  public:
                 /*Model processing*/
                 int  DofsPerNode(int** doflist,int meshtype,int approximation);

issm/trunk-jpl/src/c/analyses/analyses.h

@@ -23 +23 @@
 #include "./HydrologyDCInefficientAnalysis.h"
 #include "./HydrologyShreveAnalysis.h"
+#include "./LevelsetAnalysis.h"
 #include "./MasstransportAnalysis.h"
 #include "./MeltingAnalysis.h"

issm/trunk-jpl/src/c/cores/AnalysisConfiguration.cpp

@@ -116 +116 @@
 
                 case TransientSolutionEnum:
-                        numanalyses=12;
+                        numanalyses=13;
                         analyses=xNew<int>(numanalyses);
                         analyses[ 0]=StressbalanceAnalysisEnum;
@@ -130 +130 @@
                         analyses[10]=ExtrudeFromBaseAnalysisEnum;
                         analyses[11]=ExtrudeFromTopAnalysisEnum;
+                        analyses[12]=LevelsetAnalysisEnum;
                         break;
 

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -22 +22 @@
         int    i;
         IssmDouble starttime,finaltime,dt,yts;
-        bool   isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isdelta18o,isgia;
+        bool   isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isdelta18o,isgia,islevelset;
         bool   save_results,dakota_analysis;
         bool   time_adapt=false;
@@ -28 +28 @@
         int    meshtype,groundingline_migration;
         int    numoutputs         = 0;
+  Analysis *analysis = NULL;
         char** requested_outputs = NULL;
 
@@ -159 +160 @@
                 }
 
+                if(islevelset){
+                        if(VerboseSolution()) _printf0_("   computing movement of ice boundaries\n");
+                        //analysis = new LevelsetAnalysis();
+                        //analysis->Core(femmodel);
+                        //delete analysis;
+                }
+
                 /*unload results*/
                 if(VerboseSolution()) _printf0_("   computing requested outputs\n");

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

@@ -16 +16 @@
 
         int   i,analysis_enum,verbose;
-        bool  isthermal,ismasstransport,isstressbalance,isgroundingline,isenthalpy;
+        bool  isthermal,ismasstransport,isstressbalance,isgroundingline,isenthalpy,islevelset;
 
         /*Initialize datasets*/
@@ -34 +34 @@
         iomodel->Constant(&isthermal,TransientIsthermalEnum);
         iomodel->Constant(&isenthalpy,ThermalIsenthalpyEnum);
+        iomodel->Constant(&islevelset,TransientIslevelsetEnum);
         iomodel->Constant(&ismasstransport,TransientIsmasstransportEnum);
         iomodel->Constant(&isstressbalance,TransientIsstressbalanceEnum);
@@ -73 +74 @@
                 if(solution_enum==SteadystateSolutionEnum && analysis_enum==MeltingAnalysisEnum && isenthalpy==true) continue;
                 if(solution_enum==SteadystateSolutionEnum && analysis_enum==EnthalpyAnalysisEnum && isenthalpy==false) continue;
+                if(solution_enum==TransientSolutionEnum && analysis_enum==LevelsetAnalysisEnum && islevelset==false) continue;
+
 
                 if(VerboseMProcessor()) _printf0_("   creating datasets for analysis " << EnumToStringx(analysis_enum) << "\n");

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -273 +273 @@
         TransientIsgiaEnum,
         TransientIsdamageEnum,
+        TransientIslevelsetEnum,
         TransientNumRequestedOutputsEnum,
         TransientRequestedOutputsEnum,
@@ -317 +318 @@
         DamageEvolutionSolutionEnum,
         DamageEvolutionAnalysisEnum,
+        LevelsetAnalysisEnum,
         StressbalanceAnalysisEnum,
         StressbalanceSIAAnalysisEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -279 +279 @@
                 case TransientIsgiaEnum : return "TransientIsgia";
                 case TransientIsdamageEnum : return "TransientIsdamage";
+                case TransientIslevelsetEnum : return "TransientIslevelset";
                 case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs";
                 case TransientRequestedOutputsEnum : return "TransientRequestedOutputs";
@@ -318 +319 @@
                 case DamageEvolutionSolutionEnum : return "DamageEvolutionSolution";
                 case DamageEvolutionAnalysisEnum : return "DamageEvolutionAnalysis";
+                case LevelsetAnalysisEnum : return "LevelsetAnalysis";
                 case StressbalanceAnalysisEnum : return "StressbalanceAnalysis";
                 case StressbalanceSIAAnalysisEnum : return "StressbalanceSIAAnalysis";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -285 +285 @@
               else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum;
               else if (strcmp(name,"TransientIsdamage")==0) return TransientIsdamageEnum;
+              else if (strcmp(name,"TransientIslevelset")==0) return TransientIslevelsetEnum;
               else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
               else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
@@ -324 +325 @@
               else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
               else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
+              else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
               else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
               else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum;

issm/trunk-jpl/src/m/classes/transient.m

@@ -12 +12 @@
                 isgia             = 0;
                 isdamage             = 0;
+                islevelset = 0;
                 requested_outputs = {};
         end
@@ -32 +33 @@
                         obj.isgia           = 0;
                         obj.isdamage        = 0;
+                        obj.islevelset      = 0;
 
                         %default output
@@ -52 +54 @@
                         md = checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.isdamage','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1);
 
@@ -64 +67 @@
                         fielddisplay(obj,'isgia','indicates whether a postglacial rebound model is used in the transient');
                         fielddisplay(obj,'isdamage','indicates whether damage evolution is used in the transient');
+                        fielddisplay(obj,'islevelset','LEVEL SET DESCRIPTION...');
                         fielddisplay(obj,'requested_outputs','list of additional outputs requested');
 
@@ -74 +78 @@
                         WriteData(fid,'object',obj,'fieldname','isgia','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','isdamage','format','Boolean');
+                        WriteData(fid,'object',obj,'fieldname','islevelset','format','Boolean');
 
                         %process requested outputs

issm/trunk-jpl/src/m/classes/transient.py

@@ -18 +18 @@
                 self.isgroundingline   = False
                 self.isgia             = False
+                self.islevelset        = False
                 self.requested_outputs = []
 
@@ -31 +32 @@
                 string="%s\n%s"%(string,fielddisplay(self,'isgroundingline','indicates if a groundingline migration is used in the transient'))
                 string="%s\n%s"%(string,fielddisplay(self,'isgia','indicates if a postglacial rebound is used in the transient'))
+                string="%s\n%s"%(string,fielddisplay(self,'islevelset','LEVELSET METHOD DESCRIPTION'))
                 string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','list of additional outputs requested'))
                 return string
@@ -47 +49 @@
                 self.isgroundingline = False
                 self.isgia           = False
+                self.islevelset           = False
 
                 #default output
@@ -63 +66 @@
                 md = checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0,1])
                 md = checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0,1])
+                md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0,1])
                 md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1)
 
@@ -73 +77 @@
                 WriteData(fid,'object',self,'fieldname','isgroundingline','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','isgia','format','Boolean')
+                WriteData(fid,'object',self,'fieldname','islevelset','format','Boolean')
 
                 #process requested outputs

issm/trunk-jpl/src/m/dev/devpath.py

@@ -25 +25 @@
 from plotmodel import plotmodel
 
-c = get_ipython().config
-c.InteractiveShellApp.exec_lines = []
-c.InteractiveShellApp.exec_lines.append('%load_ext autoreload')
-c.InteractiveShellApp.exec_lines.append('%autoreload 2')
-c.InteractiveShellApp.exec_lines.append('print "Warning: disable autoreload in startup.py to improve performance." ')
+#c = get_ipython().config
+#c.InteractiveShellApp.exec_lines = []
+#c.InteractiveShellApp.exec_lines.append('%load_ext autoreload')
+#c.InteractiveShellApp.exec_lines.append('%autoreload 2')
+#c.InteractiveShellApp.exec_lines.append('print "Warning: disable autoreload in startup.py to improve performance." ')
 
 print("\n  ISSM development path correctly loaded\n\n")

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -271 +271 @@
 def TransientIsgiaEnum(): return StringToEnum("TransientIsgia")[0]
 def TransientIsdamageEnum(): return StringToEnum("TransientIsdamage")[0]
+def TransientIslevelsetEnum(): return StringToEnum("TransientIslevelset")[0]
 def TransientNumRequestedOutputsEnum(): return StringToEnum("TransientNumRequestedOutputs")[0]
 def TransientRequestedOutputsEnum(): return StringToEnum("TransientRequestedOutputs")[0]
@@ -310 +311 @@
 def DamageEvolutionSolutionEnum(): return StringToEnum("DamageEvolutionSolution")[0]
 def DamageEvolutionAnalysisEnum(): return StringToEnum("DamageEvolutionAnalysis")[0]
+def LevelsetAnalysisEnum(): return StringToEnum("LevelsetAnalysis")[0]
 def StressbalanceAnalysisEnum(): return StringToEnum("StressbalanceAnalysis")[0]
 def StressbalanceSIAAnalysisEnum(): return StringToEnum("StressbalanceSIAAnalysis")[0]