Index: /issm/trunk-jpl/src/m/classes/balancethickness.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/balancethickness.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/balancethickness.m (revision 17931)
@@ -17,5 +17,10 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' thickness constraints (NaN means no constraint) [m] ','');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' ice thickening rate used in the mass conservation (dh/dt) [m/yr] ','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', ' ',' 0: None, 1: SU, 2: SSAs artificial diffusivity, 3:DG ','');
+
+ % balancethickness drop-down (1,2, or 3)
+ fprintf(fid,'%s\n%s\n%s\n', '',' ',' 0: None, 1: SU, 2: SSAs artificial diffusivity, 3:DG ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
end % }}}
Index: /issm/trunk-jpl/src/m/classes/damage.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/damage.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/damage.m (revision 17931)
@@ -72,5 +72,11 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' maximum possible damage (0<=max_damage<1) ','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' 0: no, 1: artificial_diffusivity, 2: SUPG ','');
+ % stabilization (0,1, or 2) drop-down
+ fprintf(fid,'%s\n%s\n%s\n%s\n', '',' ',' 0: no, 1: artificial_diffusivity, 2: SUPG ');
+ fprintf(fid, '%s\n', ' ');
+ fprintf(fid, '%s\n', ' ');
+ fprintf(fid, '%s\n', ' ');
+ fprintf(fid, '%s\n','');
+
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' maximum number of non linear iterations ','');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization) ','');
Index: /issm/trunk-jpl/src/m/classes/debug.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/debug.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/debug.m (revision 17931)
@@ -14,7 +14,12 @@
fprintf(fid, '\n\n');
fprintf(fid, '%s\n', '');
- fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n%s\n', '', ' ',' ',' use Valgrind to debug (0 or 1) ','');
- fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n%s\n', '', ' ',' ',' use gnu-profiler to find out where the time is spent ','');
- fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n', '', ' ',' ',' enables profiling (memory, flops, time) ','');
+
+ %valgrind drop-down (0 or 1)
+ fprintf(fid,'%s\n%s\n%s%s%s\n%s\n%s\n', '',' ',' use Valgrind to debug (0 or 1) ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
+ fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n%s\n', '', ' ',' ',' use gnu-profiler to find out where the time is spent ','');
+ fprintf(fid,'%s%s%s\n%s\n%s%s%s\n%s\n', '', ' ',' ',' enables profiling (memory, flops, time) ','');
end % }}}
function obj = debug(varargin) % {{{
Index: /issm/trunk-jpl/src/m/classes/flowequation.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/flowequation.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/flowequation.m (revision 17931)
@@ -70,7 +70,29 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' are the Full-FS (FS) equations used ? ','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' Finite Element for SSA "P1", "P1bubble" "P1bubblecondensed" "P2" ','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' Finite Element for HO "P1" "P1bubble" "P1bubblecondensed" "P1xP2" "P2xP1" "P2" ','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' Finite Element for FS "P1P1" (debugging only) "P1P1GLS" "MINIcondensed" "MINI" "TaylorHood" ','');
+
+ % fe_SSA drop-down (P1, P1bubble, P1bubblecondensed, P2)
+ fprintf(fid,'%s\n%s\n%s\n%s\n', '',' ',' Finite Element for SSA "P1", "P1bubble" "P1bubblecondensed" "P2" ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
+ %fe_HO drop-down (P1, P1bubble, P1bubblecondensed, P1xP2, P2xP1, P2)
+ fprintf(fid,'%s\n%s\n%s\n%s\n', '',' ',' Finite Element for HO "P1" "P1bubble" "P1bubblecondensed" "P1xP2" "P2xP1" "P2" ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
+ % fe_FS drop-down (P1P1, P1P1GLS, MINIcondensed, MINI, TaylowHood)
+ fprintf(fid,'%s\n%s\n%s\n%s\n', '',' ',' Finite Element for FS "P1P1" (debugging only) "P1P1GLS" "MINIcondensed" "MINI" "TaylorHood" ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' flow equation for each vertex ','');
Index: /issm/trunk-jpl/src/m/classes/geometry.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/geometry.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/geometry.m (revision 17931)
@@ -33,5 +33,6 @@
end
methods
- function createxml(obj,fid) % {{{
+ %function createxml(obj,fid)
+ function createxml(obj, fid)% {{{
fprintf(fid, '\n\n');
fprintf(fid, '%s\n', '');
@@ -40,5 +41,5 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','',' ',' ice thickness [m] ','');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','',' ',' bed elevation [m] ','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','',' ',' bathymetry elevation [m] ','');
+ %fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','',' ',' bathymetry elevation [m] ','');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','',' ',' coefficient for ice shelves; thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro ','');
fprintf(fid,'%s\n%s\n','');
Index: /issm/trunk-jpl/src/m/classes/gia.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/gia.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/gia.m (revision 17931)
@@ -18,5 +18,9 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' mantle viscosity[Pa s] ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lithosphere thickness (km) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' 1: square-edged (default). 2: elliptical. See iedge in GiaDeflectionCore ',' ');
+ %cross_section_shape drop-down (1 o r 2)
+ fprintf(fid,'%s\n%s\n%s\n%s\n',' ',' ',' 1: square-edged (default). 2: elliptical. See iedge in GiaDeflectionCore ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
fprintf(fid,'%s\n%s\n','');
Index: /issm/trunk-jpl/src/m/classes/groundingline.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/groundingline.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/groundingline.m (revision 17931)
@@ -16,5 +16,11 @@
% Convergence criteria
fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' type of grounding line migration: "SoftMigration","AgressiveMigration" or "None" ','');
+
+ % migration (SoftMigration, AggressiveMigration, or None)drop-down
+ fprintf(fid,'%s\n%s\n%s\n%s\n','',' ',' type of grounding line migration: "SoftMigration","AgressiveMigration" or "None" ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid, '%s\n%s\n',' ','');
+
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n', '', ' ',' melting rate applied when previously grounded parts start floating [m/yr] ','');
fprintf(fid,'%s\n%s\n','');
Index: /issm/trunk-jpl/src/m/classes/inversion.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/inversion.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/inversion.m (revision 17931)
@@ -25,48 +25,53 @@
end
methods
- function createxml(obj,fid) % {{{
- fprintf(fid, '\n');
-
- % inversion parameters
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' is inversion activated? ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' 1: linear viscosity, 0: non-linear viscosity ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''} ',' ');
-
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of optimization searches ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' indicate the type of response for each optimization step ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter ',' ');
-
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' misfit convergence criterion. Default is 1%, NaN if not applied ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' maximum iterations during each optimization step ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' scaling factor on gradient direction during optimization, for each optimization step ',' ');
-
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' decrease threshold for misfit, default is 30% ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' absolute minimum acceptable value of the inversed parameter on each vertex ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' absolute maximum acceptable value of the inversed parameter on each vertex ',' ');
-
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' observed velocity x component [m/yr] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' observed velocity y component [m/yr] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' observed velocity magnitude [m/yr] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' observed thickness [m]) ',' ');
-
- fprintf(fid,'%s\n%s\n','');
-
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
-
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
-
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
-
- fprintf(fid,'%s\n%s\n','');
-
- end % }}}
+ function createxml(obj,fid) % {{{
+ fprintf(fid, '\n');
+
+ % inversion parameters
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' is inversion activated? ',' ');
+
+ % incompleteadjoing drop-down (0 or 1)
+ fprintf(fid,'%s\n%s\n%s\n%s\n',' ',' ',' 1: linear viscosity, 0: non-linear viscosity ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''} ',' ');
+
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of optimization searches ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' indicate the type of response for each optimization step ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter ',' ');
+
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' misfit convergence criterion. Default is 1%, NaN if not applied ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' maximum iterations during each optimization step ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' scaling factor on gradient direction during optimization, for each optimization step ',' ');
+
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' decrease threshold for misfit, default is 30% ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' absolute minimum acceptable value of the inversed parameter on each vertex ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' absolute maximum acceptable value of the inversed parameter on each vertex ',' ');
+
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' observed velocity x component [m/yr] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' observed velocity y component [m/yr] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' observed velocity magnitude [m/yr] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' observed thickness [m]) ',' ');
+
+ fprintf(fid,'%s\n%s\n','');
+
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
+
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
+
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' ',' ');
+
+ fprintf(fid,'%s\n%s\n','');
+
+ end % }}}
function obj = inversion(varargin) % {{{
switch nargin
Index: /issm/trunk-jpl/src/m/classes/masstransport.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/masstransport.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/masstransport.m (revision 17931)
@@ -52,6 +52,17 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' do we use free surfaces (FS only) are mass conservation ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' minimum ice thickness allowed [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' 0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin ',' ');
+
+ % hydrostatic_adjustment drop-down (incremental or absolute )
+ fprintf(fid,'%s\n%s\n%s\n%s\n',' ',' ',' adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
+ %stabilization drop-down (0, 1, 2, or 3)
+ fprintf(fid,'%s\n%s\n%s\n%s\n',' ',' ',' 0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
fprintf(fid,'%s\n%s\n','');
Index: /issm/trunk-jpl/src/m/classes/matice.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/matice.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/matice.m (revision 17931)
@@ -55,5 +55,12 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','',' ',' flow law parameter [Pa/s^(1/n)] ','');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','',' ',' Glens flow law exponent ','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','',' ',' law for the temperature dependance of the rheology: "None", "Paterson", "Arrhenius" or "LliboutryDuval" ','');
+
+ % rheology_law drop-down
+ fprintf(fid,'%s\n%s\n%s\n%s\n','',' ',' law for the temperature dependance of the rheology: "None", "Paterson", "Arrhenius" or "LliboutryDuval" ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','',' ',' Lithosphere shear modulus [Pa] ','');
Index: /issm/trunk-jpl/src/m/classes/mesh2d.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh2d.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/mesh2d.m (revision 17931)
@@ -105,56 +105,19 @@
end % }}}
function createxml(obj,fid) % {{{
- fprintf(fid, '\n');
+ fprintf(fid, '\n');
- % drop-down
- fprintf(fid,'%s%s%s%s%s\n%s\n','',' ');
-
- % dimension=0
- fprintf(fid,'%s%s%s%s%s\n%s\n',' ');
-
- % dimension=3
- fprintf(fid,'%s%s%s\n%s\n',' ');
-
- % footer for drop-down
- fprintf(fid,'%s\n%s\n%s',' select a mesh dimension 0(default) or 3 ','');
-
-
- % elements and vertices
- fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of elements ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of verticies ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertex indices of the mesh elements ',' ');
+ %elements and vertices
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' vertex indices of the mesh elements ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices z coordinate [m] ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges of the 2d mesh (vertex1 vertex2 element1 element2) ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of edges of the 2d mesh ',' ');
fprintf(fid,'%s\n%s\n','');
-
+
% properties
fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' mesh dimension ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of extrusion layers ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertices flags list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower elements flags list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertices flags list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper element flag list ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertex list (NaN for vertex on the upper surface) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper element list (NaN for element on the upper layer) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertex list (NaN for vertex on the lower surface) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower element list (NaN for element on the lower layer ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges on domain boundary (vertex1 vertex2 element) ',' ');
@@ -175,5 +138,9 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' Indicate hemisphere ''n'' or ''s'' ',' ');
+ % choice (hemisphere) 'n' or 's'
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ',' Indicate hemisphere ''n'' or ''s'' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
fprintf(fid,'%s\n%s\n','');
Index: /issm/trunk-jpl/src/m/classes/mesh2dvertical.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh2dvertical.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/mesh2dvertical.m (revision 17931)
@@ -29,4 +29,37 @@
end
methods
+ function createxml(obj,fid) % {{{
+ fprintf(fid, '\n');
+
+ %elements and vertices
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges of the 2d mesh (vertex1 vertex2 element1 element2) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of edges of the 2d mesh ',' ');
+ fprintf(fid,'%s\n%s\n',' ');
+
+ % properties
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the bed of the domain flag list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' edges on domain boundary (vertex1 vertex2 element) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number associated to each segment ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to vertex_i ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to element_i ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ %projection
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' Indicate hemisphere ''n'' or ''s'' ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ end % }}}
function obj = mesh2dvertical(varargin) % {{{
switch nargin
Index: /issm/trunk-jpl/src/m/classes/mesh3dprisms.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh3dprisms.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/mesh3dprisms.m (revision 17931)
@@ -42,4 +42,57 @@
end
methods
+ function createxml(obj,fid) % {{{
+ fprintf(fid, '\n');
+
+ % Elements and verticies of the original 2d mesh
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
+ fprintf(fid,'%s\n%s\n',' ');
+
+ % Elements and vertices of the extruded 3d mesh
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices z coordinate [m] ',' ');
+ fprintf(fid,'%s\n%s\n',' ');
+
+ % properties
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of extrusion layers ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertices flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower elements flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertices flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper elements flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertex list (NaN for vertex on the upper surface) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper element list (NaN for element on the upper layer) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertex list (NaN for vertex on the lower surface) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' element list (NaN for element on the lower layer) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to vertex_i ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ % Extracted model
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices extracted from the model ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' elements extracted from the model ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ % Projection
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' Indicate hemisphere ''n'' or ''s'' ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ end % }}}cd
function self = mesh3dprisms(varargin) % {{{
switch nargin
Index: /issm/trunk-jpl/src/m/classes/mesh3dtetras.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/mesh3dtetras.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/mesh3dtetras.m (revision 17931)
@@ -40,4 +40,57 @@
end
methods
+ function createxml(obj,fid) % {{{
+ fprintf(fid, '\n');
+
+ % Elements and verticies of the original 2d mesh
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
+ fprintf(fid,'%s\n%s\n',' ');
+
+ % Elements and vertices of the extruded 3d mesh
+ fprintf(fid,'%s\n%s\n%s\n',' ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' number of vertices ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' vertex indices of the mesh elements ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices x coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices y coordinate [m] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices z coordinate [m] ',' ');
+ fprintf(fid,'%s\n%s\n',' ');
+
+ % properties
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' number of extrusion layers ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertices flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower elements flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertices flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper elements flags list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper vertex list (NaN for vertex on the upper surface) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' upper element list (NaN for element on the upper layer) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' lower vertex list (NaN for vertex on the lower surface) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' element list (NaN for element on the lower layer) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices on the boundary of the domain flag list ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of vertices connected to vertex_i ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' average number of vertices connected to one vertex ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ % Extracted model
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices extracted from the model ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' elements extracted from the model ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ % Projection
+ fprintf(fid,'%s\n%s\n%s\n','','');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' vertices latitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' verticies longitude [degrees] ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',' ',' ',' Indicate hemisphere ''n'' or ''s'' ',' ');
+ fprintf(fid,'%s\n%s\n','');
+
+ end % }}}cd
function self = mesh3dtetras(varargin) % {{{
switch nargin
Index: /issm/trunk-jpl/src/m/classes/model.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/model.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/model.m (revision 17931)
@@ -1095,5 +1095,5 @@
md.verbose = verbose();
md.settings = settings();
- md.toolkits = toolkits();
+ %md.toolkits = toolkits();
md.cluster = generic();
md.balancethickness = balancethickness();
Index: /issm/trunk-jpl/src/m/classes/settings.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/settings.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/settings.m (revision 17931)
@@ -24,5 +24,10 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' results are output for all the nodes of each element ','');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' I/O gathering strategy for result outputs (default 1) ','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' is the memory limited ? (0 or 1) ','');
+
+ % lowmen drop-down (0 or 1)
+ fprintf(fid,'%s\n%s\n%s\n%s\n', '', ' ',' is the memory limited ? (0 or 1) ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' frequency at which results are saved in all solutions with multiple time_steps ','');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' maximum number of minutes to wait for batch results (NaN to deactivate) ','');
Index: /issm/trunk-jpl/src/m/classes/stressbalance.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/stressbalance.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/stressbalance.m (revision 17931)
@@ -35,5 +35,11 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' velocity relative convergence criterion, NaN: not applied ','');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' velocity absolute convergence criterion, NaN: not applied ','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' 0: Picards fixed point, 1: Newtons method, 2: hybrid ','');
+
+ %is newton drop-down (0,1,or 2)
+ fprintf(fid,'%s\n%s\n%s\n%s\n', '', ' ',' 0: Picards fixed point, 1: Newtons method, 2: hybrid ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' maximum number of nonlinear iterations ','');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' over-shooting constant new=new+C*(new-old) ','');
Index: /issm/trunk-jpl/src/m/classes/thermal.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/thermal.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/thermal.m (revision 17931)
@@ -22,13 +22,19 @@
% thermal solution parameters
fprintf(fid,'%s\n%s\n%s\n','','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' temperature constraints (NaN means no constraint) [K] ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' 0: no, 1: artificial_diffusivity, 2: SUPG ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' maximum number of non linear iterations ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' threshold to declare convergence of thermal solution (default is 0) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' scaling exponent (default is 3) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' use an enthalpy formulation to include temperate ice (default is 0) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0) ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' additional outputs requested ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' temperature constraints (NaN means no constraint) [K] ',' ');
+
+ % penalty_threshold drop-down (0, 1, or 2)
+ fprintf(fid,'%s\n%s\n%s\n%s\n',' ',' ',' 0: no, 1: artificial_diffusivity, 2: SUPG ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n',' ');
+ fprintf(fid,'%s\n%s\n',' ','');
+
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' maximum number of non linear iterations ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' threshold to declare convergence of thermal solution (default is 0) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' scaling exponent (default is 3) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' use an enthalpy formulation to include temperate ice (default is 0) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0) ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' additional outputs requested ',' ');
fprintf(fid,'%s\n%s\n','');
Index: /issm/trunk-jpl/src/m/classes/timestepping.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/timestepping.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/timestepping.m (revision 17931)
@@ -19,5 +19,8 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' final time to stop the simulation [yr] ','');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' length of time steps [yr] ','');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' use cfl condition to define time step ? (0 or 1) ','');
+ % time_adapt 0 or 1 drop down
+ fprintf(fid,'%s\n%s\n%s\n%s\n','',' ',' use cfl condition to define time step ? (0 or 1) ');
+ fprintf(fid, '%s\n', ' ');
+ fprintf(fid, '%s\n%s\n', ' ','');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n', '', ' ',' coefficient applied to cfl condition ','');
Index: /issm/trunk-jpl/src/m/classes/transient.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/transient.m (revision 17930)
+++ /issm/trunk-jpl/src/m/classes/transient.m (revision 17931)
@@ -27,5 +27,5 @@
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' indicates whether a groundingline migration is used in the transient ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' indicates whether a postglacial rebound model is used in the transient ',' ');
- fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' indicates whether damage evolution is used in the transient ',' ');
+ fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' indicates whether damage evolution is used in the transient ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' LEVEL SET DESCRIPTION... ',' ');
fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',' ',' ',' list of additional outputs requested ',' ');