Changeset 23936

Timestamp:

05/26/19 15:48:01 (6 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added empty shell for GlaDS

Location:

issm/trunk-jpl

Files:

• m4/analyses.m4 (modified) (1 diff)
• src/c/Makefile.am (modified) (1 diff)
• src/c/analyses/EnumToAnalysis.cpp (modified) (1 diff)
• src/c/analyses/HydrologyGlaDSAnalysis.cpp (added)
• src/c/analyses/HydrologyGlaDSAnalysis.h (added)
• src/c/analyses/analyses.h (modified) (1 diff)
• src/c/classes/FemModel.cpp (modified) (1 diff)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• src/c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (3 diffs)
• src/c/shared/io/Marshalling/IoCodeConversions.cpp (modified) (1 diff)
• src/m/classes/hydrologyglads.m (modified) (1 diff)
• src/m/classes/hydrologyshakti.m (modified) (5 diffs)

issm/trunk-jpl/m4/analyses.m4

@@ -304 +304 @@
 AC_MSG_RESULT($HAVE_HYDROLOGYSHREVE)
 dnl }}}
+dnl with-HydrologyGlaDS{{{
+AC_ARG_WITH([HydrologyGlaDS],
+        AS_HELP_STRING([--with-HydrologyGlaDS = YES], [compile with HydrologyGlaDS capabilities (default is yes)]),
+        [HYDROLOGYGLADS=$withval],[HYDROLOGYGLADS=yes])
+AC_MSG_CHECKING(for HydrologyGlaDS capability compilation)
+
+HAVE_HYDROLOGYGLADS=no 
+if test "x$HYDROLOGYGLADS" = "xyes"; then
+        HAVE_HYDROLOGYGLADS=yes
+        AC_DEFINE([_HAVE_HYDROLOGYGLADS_],[1],[with HydrologyGlaDS capability])
+fi
+AM_CONDITIONAL([HYDROLOGYGLADS], [test x$HAVE_HYDROLOGYGLADS = xyes])
+AC_MSG_RESULT($HAVE_HYDROLOGYGLADS)
+dnl }}}
 dnl with-HydrologyShakti{{{
 AC_ARG_WITH([HydrologyShakti],

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

@@ -436 +436 @@
 issm_sources += ./analyses/HydrologyPismAnalysis.cpp
 endif
+if HYDROLOGYGLADS
+issm_sources += ./analyses/HydrologyGlaDSAnalysis.cpp
+endif
 if HYDROLOGYDCINEFFICIENT
 issm_sources += ./analyses/HydrologyDCInefficientAnalysis.cpp

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

@@ -77 +77 @@
                 case HydrologyShreveAnalysisEnum : return new HydrologyShreveAnalysis();
                 #endif
+                #ifdef _HAVE_HYDROLOGYGLADS_
+                case HydrologyGlaDSAnalysisEnum : return new HydrologyGlaDSAnalysis();
+                #endif
                 #ifdef _HAVE_HYDROLOGYSHAKTI_
                 case HydrologyShaktiAnalysisEnum : return new HydrologyShaktiAnalysis();

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

@@ -30 +30 @@
 #include "./HydrologyDCInefficientAnalysis.h"
 #include "./HydrologyShreveAnalysis.h"
+#include "./HydrologyGlaDSAnalysis.h"
 #include "./HydrologyShaktiAnalysis.h"
 #include "./HydrologyPismAnalysis.h"

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

@@ -823 +823 @@
                         if(ishydrology){
                                 analyses_temp[numanalyses++]=HydrologyShreveAnalysisEnum;
+                                analyses_temp[numanalyses++]=HydrologyGlaDSAnalysisEnum;
                                 analyses_temp[numanalyses++]=HydrologyShaktiAnalysisEnum;
                                 analyses_temp[numanalyses++]=HydrologyPismAnalysisEnum;

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

@@ -424 +424 @@
         iomodel->FindConstant(&hydrology_model,"md.hydrology.model");
         if(hydrology_model==HydrologydcEnum){
+                /*FIXME: this cshould go to Analysis!!!*/
                 parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.sediment_compressibility",HydrologydcSedimentCompressibilityEnum));
                 parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.sediment_porosity",HydrologydcSedimentPorosityEnum));
@@ -450 +451 @@
                 /*Nothing to add*/
         }
+        else if(hydrology_model==HydrologyGlaDSEnum){
+                /*Nothing to add*/
+        }
         else{
                 _error_("Hydrology model "<<EnumToStringx(hydrology_model)<<" not supported yet");

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

@@ -1006 +1006 @@
         HydrologyshreveEnum,
         HydrologySolutionEnum,
+        HydrologyGlaDSAnalysisEnum,
         HydrologyShaktiAnalysisEnum,
         HydrologyPismAnalysisEnum,
+        HydrologyGlaDSEnum,
         HydrologyshaktiEnum,
         HydrologypismEnum,

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

@@ -1010 +1010 @@
                 case HydrologyshreveEnum : return "Hydrologyshreve";
                 case HydrologySolutionEnum : return "HydrologySolution";
+                case HydrologyGlaDSAnalysisEnum : return "HydrologyGlaDSAnalysis";
                 case HydrologyShaktiAnalysisEnum : return "HydrologyShaktiAnalysis";
                 case HydrologyPismAnalysisEnum : return "HydrologyPismAnalysis";
+                case HydrologyGlaDSEnum : return "HydrologyGlaDS";
                 case HydrologyshaktiEnum : return "Hydrologyshakti";
                 case HydrologypismEnum : return "Hydrologypism";

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

@@ -1034 +1034 @@
               else if (strcmp(name,"Hydrologyshreve")==0) return HydrologyshreveEnum;
               else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum;
+              else if (strcmp(name,"HydrologyGlaDSAnalysis")==0) return HydrologyGlaDSAnalysisEnum;
               else if (strcmp(name,"HydrologyShaktiAnalysis")==0) return HydrologyShaktiAnalysisEnum;
               else if (strcmp(name,"HydrologyPismAnalysis")==0) return HydrologyPismAnalysisEnum;
+              else if (strcmp(name,"HydrologyGlaDS")==0) return HydrologyGlaDSEnum;
               else if (strcmp(name,"Hydrologyshakti")==0) return HydrologyshaktiEnum;
               else if (strcmp(name,"Hydrologypism")==0) return HydrologypismEnum;
@@ -1119 +1121 @@
               else if (strcmp(name,"Mpi")==0) return MpiEnum;
               else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
-              else if (strcmp(name,"Mumps")==0) return MumpsEnum;
-              else if (strcmp(name,"Nodal")==0) return NodalEnum;
          else stage=10;
    }
    if(stage==10){
-              if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
+              if (strcmp(name,"Mumps")==0) return MumpsEnum;
+              else if (strcmp(name,"Nodal")==0) return NodalEnum;
+              else if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
               else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
               else if (strcmp(name,"NoFrictionOnPartiallyFloating")==0) return NoFrictionOnPartiallyFloatingEnum;
@@ -1242 +1244 @@
               else if (strcmp(name,"VertexPId")==0) return VertexPIdEnum;
               else if (strcmp(name,"VertexSId")==0) return VertexSIdEnum;
-              else if (strcmp(name,"VertexLId")==0) return VertexLIdEnum;
-              else if (strcmp(name,"Vertices")==0) return VerticesEnum;
          else stage=11;
    }
    if(stage==11){
-              if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
+              if (strcmp(name,"VertexLId")==0) return VertexLIdEnum;
+              else if (strcmp(name,"Vertices")==0) return VerticesEnum;
+              else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
               else if (strcmp(name,"Water")==0) return WaterEnum;
               else if (strcmp(name,"XTaylorHood")==0) return XTaylorHoodEnum;

issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp

@@ -226 +226 @@
                 case 3: return HydrologyshaktiEnum;
                 case 4: return HydrologypismEnum;
+                case 5: return HydrologyGlaDSEnum;
                 default: _error_("Marshalled hydrology code \""<<enum_in<<"\" not supported yet");
         }

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

@@ -58 +58 @@
                 end % }}}
                 function disp(self) % {{{
-                        disp(sprintf('   GLaDS (hydrologyglads) solution parameters:'));
+                        disp(sprintf('   GlaDS (hydrologyglads) solution parameters:'));
                         disp(sprintf('      SHEET'));
                         fielddisplay(self,'pressure_melt_coefficient','Pressure melt coefficient (c_t) [K Pa^-1]');

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

@@ -17 +17 @@
                 relaxation      = 0;
                 storage         = 0;
-    requested_outputs = {};
+                requested_outputs = {};
         end
         methods
@@ -32 +32 @@
                         end
                 end % }}}
-    function list = defaultoutputs(self,md) % {{{
-        list = {'HydrologyHead','HydrologyGapHeight','EffectivePressure','HydrologyBasalFlux','DegreeOfChannelization'};
-    end % }}}    
+                function list = defaultoutputs(self,md) % {{{
+                        list = {'HydrologyHead','HydrologyGapHeight','EffectivePressure','HydrologyBasalFlux','DegreeOfChannelization'};
+                end % }}}    
 
                 function self = setdefaultparameters(self) % {{{
-              % Set under-relaxation parameter to be 1 (no under-relaxation of nonlinear iteration)     
+                        % Set under-relaxation parameter to be 1 (no under-relaxation of nonlinear iteration)   
                         self.relaxation=1;
                         self.storage=0;
-      self.requested_outputs={'default'};
+                        self.requested_outputs={'default'};
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -58 +58 @@
                         md = checkfield(md,'fieldname','hydrology.neumannflux','timeseries',1,'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','hydrology.spchead','size',[md.mesh.numberofvertices 1]);        
-         md = checkfield(md,'fieldname','hydrology.relaxation','>=',0); 
+                        md = checkfield(md,'fieldname','hydrology.relaxation','>=',0);  
                         md = checkfield(md,'fieldname','hydrology.storage','>=',0);
-      md = checkfield(md,'fieldname','hydrology.requested_outputs','stringrow',1);
+                        md = checkfield(md,'fieldname','hydrology.requested_outputs','stringrow',1);
                 end % }}}
                 function disp(self) % {{{
@@ -75 +75 @@
                         fielddisplay(self,'relaxation','under-relaxation coefficient for nonlinear iteration');
                         fielddisplay(self,'storage','englacial storage coefficient (void ratio)');
-      fielddisplay(self,'requested_outputs','additional outputs requested');
+                        fielddisplay(self,'requested_outputs','additional outputs requested');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
@@ -91 +91 @@
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','neumannflux','format','DoubleMat','mattype',2,'timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','spchead','format','DoubleMat','mattype',1);
-      WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','relaxation','format','Double');
+                        WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','relaxation','format','Double');
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','storage','format','Double');
-      outputs = self.requested_outputs;
-      pos  = find(ismember(outputs,'default'));
-      if ~isempty(pos),
-        outputs(pos) = [];  %remove 'default' from outputs
-        outputs      = [outputs defaultoutputs(self,md)]; %add defaults
-      end
-      WriteData(fid,prefix,'data',outputs,'name','md.hydrology.requested_outputs','format','StringArray');
+                        outputs = self.requested_outputs;
+                        pos  = find(ismember(outputs,'default'));
+                        if ~isempty(pos),
+                                outputs(pos) = [];  %remove 'default' from outputs
+                                outputs      = [outputs defaultoutputs(self,md)]; %add defaults
+                        end
+                        WriteData(fid,prefix,'data',outputs,'name','md.hydrology.requested_outputs','format','StringArray');
                 end % }}}
         end