Changeset 9632 for issm/trunk/src/m/classes/model/model.m

Timestamp:

09/06/11 16:36:00 (14 years ago)

Author:

seroussi

Message:

implemented thermal

File:

• issm/trunk/src/m/classes/model/model.m (modified) (7 diffs)

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

@@ -23 +23 @@
                  settings  = modelfield('default',0,'marshall',true);
                  radaroverlay = modelfield('default',0,'marshall',false);
+                 thermal   = modelfield('default',0,'marshall',true);
                  miscellaneous = modelfield('default',0,'marshall',true);
                  timestepping = modelfield('default',0,'marshall',true);
@@ -111 +112 @@
                  mixed_layer_capacity       = modelfield('default',0,'marshall',true,'format','Double');
                  thermal_exchange_velocity  = modelfield('default',0,'marshall',true,'format','Double');
-                 min_thermal_constraints    = modelfield('default',0,'marshall',true,'format','Integer');
                  min_mechanical_constraints = modelfield('default',0,'marshall',true,'format','Integer');
-                 stabilize_constraints      = modelfield('default',0,'marshall',true,'format','Integer');
 
                  %Physical parameters
@@ -140 +139 @@
                  spcvy          = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  spcvz          = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
-                 spctemperature = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  spcthickness   = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  diagnostic_ref = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
@@ -409 +407 @@
                          if isfield(structmd,'hydro_CR'), md.hydrology.CR=structmd.hydro_CR; end
                          if isfield(structmd,'hydro_kn'), md.hydrology.kn=structmd.hydro_kn; end
+                         if isfield(structmd,'spctemperature'), md.thermal.spctemperature=structmd.spctemperature; end
+                         if isfield(structmd,'min_thermal_constraints'), md.thermal.penalty_threshold=structmd.min_thermal_constraints; end
+                         if isfield(structmd,'artificial_diffusivity'), md.thermal.stabilization=structmd.artificial_diffusivity; end
+                         if isfield(structmd,'max_nonlinear_iterations'), md.thermal.maxiter=structmd.max_nonlinear_iterations; end
+                         if isfield(structmd,'stabilize_constraints'), md.thermal.penalty_lock=structmd.stabilize_constraints; end
+                         if isfield(structmd,'penalty_offset'), md.thermal.penalty_factor=structmd.penalty_offset; end
                          if isfield(structmd,'name'), md.miscellaneous.name=structmd.name; end
                          if isfield(structmd,'notes'), md.miscellaneous.notes=structmd.notes; end
@@ -530 +534 @@
                          md.settings=settings;
                          md.radaroverlay=radaroverlay;
+                         md.thermal=thermal;
                          md.miscellaneous=miscellaneous;
                          md.timestepping=timestepping;
@@ -621 +626 @@
                          %a few constraints remain unstable. For thermal computation, this
                          %parameter is often used.
-                         md.min_thermal_constraints=0;
                          md.min_mechanical_constraints=0;
 
@@ -709 +713 @@
                                  if(strcmp(index1.subs,'diagnostic')), displaydiagnostic(md);return; end
                                  if(strcmp(index1.subs,'prognostic')), displayprognostic(md);return; end
-                                 if(strcmp(index1.subs,'thermal')), displaythermal(md);return; end
                                  if(strcmp(index1.subs,'transient')), displaytransient(md);return; end
                                  if(strcmp(index1.subs,'control')), displaycontrol(md);return; end