Changeset 9629

Timestamp:

09/06/11 15:55:32 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added groundingline object

Location:

issm/trunk

Files:

• src/m/classes/groundingline.m (added)
• src/m/classes/model/model.m (modified) (7 diffs)
• src/m/model/ismodelselfconsistent.m (modified) (1 diff)
• src/m/model/tres.m (modified) (1 diff)
• src/m/utils/Mesh/BuildAdaptedMesh.m (deleted)
• template (modified) (1 diff)
• test/NightlyRun/test446.m (modified) (1 diff)
• test/Par/RoundSheetShelf.par (modified) (1 diff)

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

@@ -25 +25 @@
                  miscellaneous = modelfield('default',0,'marshall',true);
                  timestepping = modelfield('default',0,'marshall',true);
+                 groundingline = modelfield('default',0,'marshall',true);
 
                  %FIXME: all other fields should belong to other classes
@@ -193 +194 @@
                  temperature                    = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); %temperature solution vector
                  waterfraction                  = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
-                 groundingline_melting_rate                = modelfield('default',NaN,'marshall',true,'format','Double');
                  pressure                       = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
                  %Hydrology
@@ -226 +226 @@
                  ad_forward = modelfield('default',true,'marshall',true,'format','Boolean');
                  ad_reverse = modelfield('default',false,'marshall',true,'format','Boolean');
-
-                 %grounding line migration: 
-                 groundingline_migration = modelfield('default','','marshall',true,'preprocess','StringToEnum','format','Integer');
 
                  %partitioner:
@@ -468 +465 @@
                          end
                          if isnumeric(structmd.groundingline_migration),
-                                 if (structmd.groundingline_migration==272), md.groundingline_migration='None';      end
-                                 if (structmd.groundingline_migration==273), md.groundingline_migration='AgressiveMigration';  end
-                                 if (structmd.groundingline_migration==274), md.groundingline_migration='SoftMigration'; end
+                                 if (structmd.groundingline_migration==272), md.groundingline.migration='None';      end
+                                 if (structmd.groundingline_migration==273), md.groundingline.migration='AgressiveMigration';  end
+                                 if (structmd.groundingline_migration==274), md.groundingline.migration='SoftMigration'; end
                          end
                          if isnumeric(md.control_type),
@@ -538 +535 @@
                          md.miscellaneous=miscellaneous;
                          md.timestepping=timestepping;
+                         md.groundingline=groundingline;
 
                          %Materials parameters
@@ -552 +550 @@
                          %ice latent heat of fusion L (J/kg)
                          md.latentheat=3.34*10^5;
-
-                         %basal melting rate correction: 
-                         md.groundingline_melting_rate=0; 
 
                          %ice thermal conductivity lamda (W/m/K)
@@ -683 +678 @@
                          %NaN if not applied
                          md.eps_cm=NaN; %not activated
-
-                         %grounding line migration: 
-                         md.groundingline_migration='None';
 
                          %How often to save results, default is 1 so save every step

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

@@ -120 +120 @@
 end
 %GROUNDING LINE MIGRATION {{{1
-if ~ismember({md.groundingline_migration},{'None' 'AgressiveMigration' 'SoftMigration'}),
-        message(['model not consistent: model ' md.miscellaneous.name ' groundingline_migration field should be ''None'' ''AgressiveMigration'' or ''SoftMigration''']);
-end
-if ~strcmp(md.groundingline_migration,'None'),
+if ~ismember({md.groundingline.migration},{'None' 'AgressiveMigration' 'SoftMigration'}),
+        message(['model not consistent: model ' md.miscellaneous.name ' groundingline.migration field should be ''None'' ''AgressiveMigration'' or ''SoftMigration''']);
+end
+if ~strcmp(md.groundingline.migration,'None'),
         if (md.dim==3 | strcmpi(md.cluster.name,'none')),
                 message(['model ' md.miscellaneous.name ' requesting grounding line migration, but grounding line module only implemented for 2d models and parallel runs!']);

issm/trunk/src/m/model/tres.m

@@ -67 +67 @@
                         results2(count).time=md.results.TransientSolution(i).time;
                         results2(count).step=md.results.TransientSolution(i).step;
-                        if ~strcmpi(md.groundingline_migration,'None'),
+                        if ~strcmpi(md.groundingline.migration,'None'),
                                 results2(count).ElementOnIceShelf=md.results.TransientSolution(i).ElementOnIceShelf;
                         end

issm/trunk/template

@@ -163 +163 @@
    isgroundingline -> add
    requested_outputs
-}}}
-goundingline {{{
-        groundingline_migration -> rename migration_type
-        groundingline_melting_rate -> rename melting_rate
 }}}
 inversion{{{ 

issm/trunk/test/NightlyRun/test446.m

@@ -43 +43 @@
 %test different grounding line dynamics.
 %grounding line: 
-md.groundingline_migration='AgressiveMigration';
+md.groundingline.migration='AgressiveMigration';
 md=solve(md,GroundinglineMigration2DSolutionEnum);
 element_on_iceshelf_agressive=PatchToVec(md.results.GroundinglineMigration2DSolution.ElementOnIceShelf);
 
-md.groundingline_migration='SoftMigration';
+md.groundingline.migration='SoftMigration';
 md=solve(md,GroundinglineMigration2DSolutionEnum);
 element_on_iceshelf_soft=PatchToVec(md.results.GroundinglineMigration2DSolution.ElementOnIceShelf);

issm/trunk/test/Par/RoundSheetShelf.par

@@ -68 +68 @@
 
 %bathymetry and grounding line migration:
-md.groundingline_migration='AgressiveMigration';
+md.groundingline.migration='AgressiveMigration';
 md.bathymetry=md.bed;
 pos=find(md.nodeoniceshelf); md.bathymetry(pos)=md.bed(pos)-900;