Changes between Version 35 and Version 36 of fieldupdate

Timestamp:

09/08/11 14:37:32 (13 years ago)

Author:

Mathieu Morlighem

Comment:

--

fieldupdate

@@ -12 +12 @@
 || basal_melting_rate_correction || basalforcings.melting_rate_correction || ||
 || basal_melting_rate_correction_apply || ||DELETED (set field as 0 instead) ||
-|| bathymetry || bathymetry || ||
-|| bed || bed || ||
+|| bathymetry ||  geometry.bathymetry || ||
+|| bed || geometry.bed || ||
 || bed_slopex || || DELETED (moved to results) ||
 || bed_slopey || ||  DELETED (moved to results) ||
@@ -20 +20 @@
 || cfl_coefficient || timestepping.cfl_coefficient || ||
 || cluster || cluster || ||
-|| cm_gradient || cm_gradient || ||
-|| cm_jump || cm_jump || ||
-|| cm_max || cm_max || ||
-|| cm_min || cm_min || ||
-|| cm_responses || cm_responses || ||
+|| cm_gradient || inversion.gradient_only || ||
+|| cm_jump || inversion.step_threshold || ||
+|| cm_max || inversion.max_parameters || ||
+|| cm_min || inversion.min_parameters || ||
+|| cm_responses || inversion.cost_functions || ||
 || connectivity || connectivity || ||
-|| control_analysis || control_analysis || ||
-|| control_type || control_type ||cell of string: {'Dragcoefficient'} ||
+|| control_analysis || inversion.iscontrol || ||
+|| control_type || inversion.control_parameters ||cell of string: {'Dragcoefficient'} ||
 || counter ||  || DELETED ||
 || dakotadat || || DELETED||
@@ -66 +66 @@
 || elements_type2d || || DELETED||
 || eps_abs || diagnostic.abstol || ||
-|| eps_cm || eps_cm || ||
+|| eps_cm || inversion.cost_function_threshold || ||
 || eps_rel || diagnostic.reltol || ||
 || eps_rel || steadystate.reltol || One convergence criterion per type of solution ||
@@ -119 +119 @@
 || max_nonlinear_iterations || thermal.maxiter || One maxiter per type of solution ||
 || max_steadystate_iterations || steadystate.maxiter || ||
-|| maxiter || maxiter || ||
+|| maxiter || inversion.maxiter_per_step || ||
 || meanvel || || DELETED ||
 || meltingpoint || meltingpoint || ||
@@ -146 +146 @@
 || notes || miscellaneous.notes || ||
 || npart || qmu.numberofpartitions || ||
-|| nsteps || nsteps || ||
-|| num_cm_responses || num_cm_responses || ||
-|| num_control_type || num_control_type || ||
+|| nsteps || inversion.nsteps || ||
+|| num_cm_responses || inversion.num_cost_functions || ||
+|| num_control_type || inversion.num_control_parameters || ||
 || numberofelements || numberofelements || ||
 || numberofelements2d || numberofelements2d || ||
@@ -158 +158 @@
 || numrifts || rifts.numrifts || ||
 || observed_temperature || || DELETED (use temperature field instead) ||
-|| optscal || optscal || ||
+|| optscal || inversion.gradient_scaling || ||
 || outlog || outlog || ||
 || output_frequency || output_frequency || ||
@@ -227 +227 @@
 || stress_bed || || DELETED (moved to results) ||
 || stress_surface || || DELETED (moved to results) ||
-|| surface || surface || ||
+|| surface ||  geometry.surface || ||
 || surface_ablation_rate || surfaceforcings.ablation_rate || ||
 || surface_accumulation_rate || surfaceforcings.accumulation_rate || ||
@@ -235 +235 @@
 || thermal_exchange_velocity || materials.thermal_exchange_velocity || ||
 || thermalconductivity || materials.thermalconductivity || ||
-|| thickness || thickness || ||
-|| thickness_coeff || thickness_coeff || ||
-|| thickness_obs || thickness_obs || ||
+|| thickness ||  geometry.thickness || ||
+|| thickness_coeff ||  geometry.hydrostatic_ratio || ||
+|| thickness_obs ||  inversion.thickness_obs || ||
 || time_adapt ||  timestepping.time_adapt || ||
 || timeacc || ||DELETED ||
@@ -247 +247 @@
 || variables || qmu.variables || ||
 || vel || vel || ||
-|| vel_bal || vel_bal || ||
-|| vel_obs || vel_obs || ||
-|| vel_obs_raw || vel_obs_raw || ||
+|| vel_bal || || DELETED||
+|| vel_obs ||  inversion.vel_obs || ||
+|| vel_obs_raw || ||DELETED ||
 || verbose || verbose || ||
 || vertices_type || flowequation.vertex_equation || new numbering ||
@@ -258 +258 @@
 || vx || vx || ||
 || vx_bal || || DELETED||
-|| vx_obs || vx_obs || ||
+|| vx_obs || inversion.vx_obs || ||
 || vx_obs_raw || || DELETED||
 || vy || vy || ||
 || vy_bal || ||DELETED ||
-|| vy_obs || vy_obs || ||
+|| vy_obs ||  inversion.vy_obs || ||
 || vy_obs_raw || ||DELETED ||
 || vz || vz || ||
@@ -269 +269 @@
 || waterfraction || waterfraction || ||
 || wateroutline || ||DELETED ||
-|| weights || weights || ||
+|| weights || inversion.cost_functions_coefficients || ||
 || x || x || ||
 || x2d || x2d || ||