Index: /issm/trunk-jpl/src/m/classes/model.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/model.m	(revision 21701)
+++ /issm/trunk-jpl/src/m/classes/model.m	(revision 21702)
@@ -122,15 +122,9 @@
 			end
 			%2014 November 12
-			if isa(md.calving,'double');
-				md.calving=calving();
-			end
+			if isa(md.calving,'double'); md.calving=calving(); end
 			%2016 February 3
-			if isa(md.slr,'double');
-				md.slr=slr();
-			end
+			if isa(md.slr,'double'); md.slr=slr(); end
 			%2016 October 11
-			if isa(md.esa,'double');
-				md.esa=esa();
-			end
+			if isa(md.esa,'double'); md.esa=esa(); end
 			%2017 February 10th
 			if md.settings.solver_residue_threshold==0,
@@ -138,7 +132,7 @@
 			end
 			%2017 April 10th
-			if isa(md.gia,'gia');
-				md.gia=giaivins();
-			end
+			if isa(md.gia,'gia'), md.gia=giaivins(); end
+			%2017 May 4th
+			if isa(md.amr,'double'); md.amr=amr(); end
 
 		end% }}}
