Index: /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaOcn.m
===================================================================
--- /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaOcn.m	(revision 28053)
+++ /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaOcn.m	(revision 28054)
@@ -24,11 +24,21 @@
 end
 
-rootname = [path model_name '_' scenario '/'];
-if ~exist(rootname,'dir')
+%Find forcing file
+rootname = [path model_name '_' scenario '/1995-2100'];
+list = dir(rootname);
+found = false;
+for i=1:numel(list)
+	if strcmpi(list(i).name, [model_name '_thermal_forcing_8km_x_60m.nc'])
+		disp(['Found tf file: ' list(i).name]);
+		tfnc = [rootname '/' list(i).name];
+		found = true;
+	end
+end
+if ~found
    error(['this path does not exist or the ' model_name ' and ' scenario ' are not available in this combination.']);
 end
 
 %load TF data
-tfnc    = [rootname '/1995-2100/' upper(model_name) '_thermal_forcing_8km_x_60m.nc'];
+disp('   == loading TF');
 x_n     = double(ncread(tfnc,'x'));
 y_n     = double(ncread(tfnc,'y'));
@@ -37,5 +47,5 @@
 
 %Build tf cell array
-t = 1:size(tf_data,4);
+time = 1995:2100;
 tf = cell(1,1,size(tf_data,3));
 for i=1:size(tf_data,3)  %Iterate over depths
@@ -48,5 +58,5 @@
 		temp_matrix = [temp_matrix temp_tfdata];
 	end
-	tf{:,:,i} = [temp_matrix ; t];
+	tf{:,:,i} = [temp_matrix ; time];
 end
 
@@ -82,2 +92,4 @@
 basalforcings.gamma_0    = gamma0_median;
 basalforcings.tf         = tf;
+
+disp('Info: forcings cover 1995 to 2100');
Index: /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaSMB.m
===================================================================
--- /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaSMB.m	(revision 28053)
+++ /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaSMB.m	(revision 28054)
@@ -13,5 +13,5 @@
 %
 %   Examples:
-%      md.smb = interpISMIP6AntarcticaSMB(md,'miroc-esm-chem','rcp85');
+%      md.smb = interpISMIP6AntarcticaSMB(md,'miroc-esm-chem','rcp8.5');
 
 % Find appropriate directory
@@ -23,11 +23,25 @@
 end
 
+%find which files are available and do a case insensitive test
 rootname = [path model_name '_' scenario '/'];
-if ~exist(rootname,'dir')
+list = dir([rootname '/Regridded_2km/']);
+found1 = false; found2 = false;
+for i=1:numel(list)
+	if strcmpi(list(i).name, [model_name '_2km_clim_1995-2014.nc'])
+		disp(['Found clim file: ' list(i).name]);
+		smbclimnc = [rootname '/Regridded_2km/' list(i).name];
+		found1 = true;
+	end
+	if strcmpi(list(i).name, [model_name '_2km_anomaly_1995-2100.nc'])
+		disp(['Found anom file: ' list(i).name]);
+		smbanomnc = [rootname '/Regridded_2km/' list(i).name];
+		found2 = true;
+	end
+end
+if ~found1 || ~found2
    error(['this path does not exist or the ' model_name ' and ' scenario ' are not available in this combination.']);
 end
 
 disp('   == loading TS and SMB climatology data');
-smbclimnc           = [rootname '/Regridded_2km/' upper(model_name) '_2km_clim_1995-2014.nc'];
 lat                 = double(ncread(smbclimnc,'lat'));
 lon                 = double(ncread(smbclimnc,'lon'));
@@ -36,5 +50,4 @@
 
 disp('   == loading TS and SMB anomoly data');
-smbanomnc           = [rootname '/Regridded_2km/' upper(model_name) '_2km_anomaly_1995-2100.nc'];
 smb_anomaly_data    = double(ncread(smbanomnc,'smb_anomaly'));
 ts_anomaly_data     = double(ncread(smbanomnc,'ts_anomaly'));
@@ -42,5 +55,5 @@
 %Create SMB and TS matrix
 disp('   == Interpolating on model');
-t=[1:size(smb_anomaly_data,3)];
+time = [1995:2100];
 [x_n y_n]=ll2xy(lat(:,1),lon(:,1),-1);
 y_n = x_n;
@@ -66,7 +79,8 @@
 %Save Data (1995-2100)
 smb = SMBforcing();
-smb.mass_balance = [temp_matrix_smb ; t];
+smb.mass_balance = [temp_matrix_smb ; time];
 
 %What do we do with surface temp?
-%md.miscellaneous.dummy.ts = [temp_matrix_ts ; t];
+%md.miscellaneous.dummy.ts = [temp_matrix_ts ; time];
+disp('Info: forcings cover 1995 to 2100');
 end