Changeset 8486

Timestamp:

06/03/11 08:20:04 (14 years ago)

Author:

seroussi

Message:

trunk.m: work on enthalpy

Location:

issm/trunk/src/m

Files:

• classes/version/7.6/model.m (modified) (3 diffs)
• classes/version/7.7/model.m (modified) (3 diffs)
• enum/ReferenceTemperatureEnum.m (added)
• enum/WaterFractionEnum.m (added)
• model/extrude.m (modified) (1 diff)
• model/ismodelselfconsistent.m (modified) (1 diff)
• model/marshall.m (modified) (2 diffs)

issm/trunk/src/m/classes/version/7.6/model.m

@@ -122 +122 @@
                  thermalconductivity=0;
                  meltingpoint=0;
+                 referencetemperature=0; %for enthalpy
                  beta=0;
                  
@@ -272 +273 @@
                  basal_melting_rate_correction_apply=0;
                  pressure=NaN;
+                 waterfraction=NaN;
                  
                  %hydrology
@@ -571 +573 @@
                          md.meltingpoint=273.15;
 
+                         %the reference temperature for enthalpy model (cf Aschwanden)
+                         md.referencetemperature=223.15;
+
                          %rate of change of melting point with pressure (K/Pa)
                          md.beta=9.8*10^-8;

issm/trunk/src/m/classes/version/7.7/model.m

@@ -122 +122 @@
                  thermalconductivity=0;
                  meltingpoint=0;
+                 referencetemperature=0; %for enthalpy
                  beta=0;
                  
@@ -267 +268 @@
                  vel=NaN;
                  temperature=NaN; %temperature solution vector
+                 waterfraction=NaN;
                  gl_melting_rate=NaN;
                  basal_melting_rate=NaN;
@@ -643 +645 @@
                          md.meltingpoint=273.15;
 
+                         %the reference temperature for enthalpy model (cf Aschwanden)
+                         md.referencetemperature=223.15;
+
                          %rate of change of melting point with pressure (K/Pa)
                          md.beta=9.8*10^-8;

issm/trunk/src/m/model/extrude.m

@@ -170 +170 @@
 if ~isnan(md.vel),md.vel=project3d(md,md.vel,'node');end;
 if ~isnan(md.temperature),md.temperature=project3d(md,md.temperature,'node');end;
+if ~isnan(md.waterfraction),md.waterfraction=project3d(md,md.waterfraction,'node');end;
 if ~isnan(md.surface_slopex),md.surface_slopex=project3d(md,md.surface_slopex,'node');end;
 if ~isnan(md.surface_slopey),md.surface_slopey=project3d(md,md.surface_slopey,'node');end;

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -510 +510 @@
                                 %INITIAL TEMPERATURE, MELTING AND ACCUMULATION
                                 fields={'temperature','surface_mass_balance','basal_melting_rate'};
+                                checksize(md,fields,[md.numberofnodes 1]);
+                                checknan(md,fields);
+
+                                %INITIAL TEMPERATURE
+                                fields={'temperature','spctemperature(:,2)','observed_temperature'};
+                                checkgreater(md,fields,0)
+                        end
+                        %}}}
+                case EnthalpyAnalysisEnum,
+                        % {{{2
+                        %EXTRUSION
+                        if (md.dim==2),
+                                if md.solution_type==TransientSolutionEnum,
+                                        return;
+                                else
+                                        error(['model not consistent: for a ' EnumToString(md.solution_type) ' computation, the model must be 3d, extrude it first!'])
+                                end
+                        end
+
+                        %CHECK THAT WE ARE NOT FULLY CONSTRAINED
+                        if isnan(find(~md.spctemperature(:,1))),
+                                error(['model not consistent: model ' md.name ' is totally constrained for temperature, no need to solve!']);
+                        end
+
+                        %VELOCITIES AND PRESSURE
+                        fields={'vx','vy','vz','pressure','geothermalflux'};
+                        checksize(md,fields,[md.numberofnodes 1]);
+                        checknan(md,fields);
+
+                        %THERMAL TRANSIENT
+                        if md.dt~=0,
+
+                                %DT and NDT
+                                fields={'dt','ndt'};
+                                checkgreaterstrict(md,fields,0);
+
+                                %INITIAL TEMPERATURE, MELTING, ACCUMULATION AND WATERFRACTION
+                                fields={'temperature','surface_mass_balance','basal_melting_rate','waterfraction'};
                                 checksize(md,fields,[md.numberofnodes 1]);
                                 checknan(md,fields);

issm/trunk/src/m/model/marshall.m

@@ -66 +66 @@
 WriteData(fid,md.pressure,'Mat','pressure');
 WriteData(fid,md.temperature,'Mat','temperature');
+WriteData(fid,md.waterfraction,'Mat','waterfraction');
 
 
@@ -202 +203 @@
 WriteData(fid,md.hydro_kn,'Scalar','hydro_kn');
 WriteData(fid,md.meltingpoint,'Scalar','meltingpoint');
+WriteData(fid,md.referencetemperature,'Scalar','referencetemperature');
 WriteData(fid,md.latentheat,'Scalar','latentheat');
 WriteData(fid,md.heatcapacity,'Scalar','heatcapacity');