Index: /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaOcn.m
===================================================================
--- /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaOcn.m	(revision 28064)
+++ /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaOcn.m	(revision 28065)
@@ -1,18 +1,28 @@
-function basalforcings = interpISMIP6AntarcticaOcn(md,model_name,scenario)
+function basalforcings = interpISMIP6AntarcticaOcn(md,model_name)
 %interpISMIP6AntarcticaOcn - interpolate chosen ISMIP6 atmospheric forcing to model
 %
 %   Input:
 %     - md (model object)
-%     - model_name  (string): name of the climate model 
-%                             Examples: cnrm-esm2-1 ccsm4cesm2 cnrm-cm6-1 csiro-mk3-6-0
-%                                       hadgem2-es ipsl-cm5a-mr miroc-esm-chem noresm1-m ukesm1-0-ll
+%     - model_name (string): name of the climate model and scenario
+%       - suppported options from /totten_1/ModelData/ISMIP6/Projections/AIS/Ocean_Forcing/
+%             2.6 scenario             8.5 scenario
+%             ---------------------------------------------
+%                                      ccsm4_rcp8.5
+%                                      cesm2_ssp585
+%             cnrm-cm6-1_ssp126        cnrm-cm6-1_ssp585
+%                                      cnrm-esm2-1_ssp585
+%                                      csiro-mk3-6-0_rcp8.5
+%                                      hadgem2-es_rcp8.5
+%             ipsl-cm5a-mr_rcp2.6      ipsl-cm5a-mr_rcp8.5
+%                                      miroc-esm-chem_rcp8.5
+%             noresm1-m_rcp2.6         noresm1-m_rcp8.5
+%                                      ukesm1-0-ll_ssp585
 %
-%     - scenario    (string): name of the climate scenario
-%                             Examples: rcp2.6, rcp8.5, ssp126, ssp585
 %   Output:
-%     - basalforcings: prepared to be input directly into md.smb
+%     - basalforcings: prepared to be input directly into md.basalforcings
+%                      time series from 1995-2100
 %
 %   Examples:
-%      md.basalforcings = interpISMIP6AntarcticaOcn(md,'miroc-esm-chem','rcp8.5');
+%      md.basalforcings = interpISMIP6AntarcticaOcn(md,'miroc-esm-chem_rcp8.5');
 
 % Find appropriate directory
@@ -24,18 +34,15 @@
 end
 
-%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
+% search for thermal forcing file in the ISMIP climate model directory
+rootname=[path model_name '/1995-2100/']; % root directory for the climate model files
+tffile=dir([rootname '*_thermal_forcing_8km_x_60m.nc']); % thermal forcing file if found
+
+% throw error if file not found, or if the file search is not unique
+if length(tffile)~=1
+   error(['this path does not exist or is not unique under ' rootname]);
 end
-if ~found
-   error(['this path does not exist or the ' model_name ' and ' scenario ' are not available in this combination.']);
-end
+
+% save the full path of the found files
+tfnc=[rootname tffile.name];
 
 %load TF data
Index: /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaSMB.m
===================================================================
--- /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaSMB.m	(revision 28064)
+++ /issm/trunk-jpl/src/m/parameterization/interpISMIP6AntarcticaSMB.m	(revision 28065)
@@ -1,17 +1,27 @@
-function smb = interpISMIP6AntarcticaSMB(md,model_name,scenario)
+function smb = interpISMIP6AntarcticaSMB(md,model_name)
 %interpISMIP6AntarcticaSMB - interpolate chosen ISMIP6 atmospheric forcing to model
 %
 %   Input:
 %     - md (model object)
-%     - model_name  (string): name of the climate model 
-%                             Examples: CESM2 CNRM_CM6 CNRM_ESM2 CSIRO-Mk3-6-0 HadGEM2-ES IPSL-CM5A-MR 
-%                                       ccsm4 miroc-esm-chem noresm1-m
-%     - scenario    (string): name of the climate scenario
-%                             Examples: rcp26, rcp85, ssp126, ssp585
+%     - model_name (string): name of the climate model and scenario
+%       - suppported options from /totten_1/ModelData/ISMIP6/Projections/AIS/Atmosphere_Forcing/
+%             2.6 scenario             8.5 scenario
+%             ---------------------------------------------
+%             ccsm4_rcp2.6             ccsm4_rcp8.5
+%                                      CESM2_ssp585 
+%             CNRM_CM6_ssp126          CNRM_CM6_ssp585 
+%                                      CNRM_ESM2_ssp585
+%                                      CSIRO-Mk3-6-0_rcp85
+%                                      HadGEM2-ES_rcp85
+%             IPSL-CM5A-MR_rcp26       IPSL-CM5A-MR_rcp85
+%             miroc-esm-chem_rcp2.6    miroc-esm-chem_rcp8.5
+%             noresm1-m_rcp2.6         noresm1-m_rcp8.5
+%
 %   Output:
 %     - smb: prepared to be input directly into md.smb
+%            time series from 1995-2100
 %
 %   Examples:
-%      md.smb = interpISMIP6AntarcticaSMB(md,'miroc-esm-chem','rcp8.5');
+%      md.smb = interpISMIP6AntarcticaSMB(md,'miroc-esm-chem_rcp8.5');
 
 % Find appropriate directory
@@ -23,24 +33,19 @@
 end
 
-%find which files are available and do a case insensitive test
-rootname = [path model_name '_' scenario '/'];
-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.']);
+% search for smb files in the ISMIP climate model directory
+rootname=[path model_name '/Regridded_2km/']; % root directory for the climate model files
+smbclimfile=dir([rootname '*_2km_clim_1995-2014.nc']); % climatology file if found
+smbanomfile=dir([rootname '*_2km_anomaly_1995-2100.nc']); % anomaly file if found
+
+% throw error if files are not found, or if the file search is not unique
+if length(smbclimfile)~=1 || length(smbanomfile)~=1
+   error(['this path does not exist or is not unique under ' rootname]);
 end
 
+% save the full path of the found files
+smbclimnc=[rootname smbclimfile.name];
+smbanomnc=[rootname smbanomfile.name];
+
+% load data from files
 disp('   == loading TS and SMB climatology data');
 lat                 = double(ncread(smbclimnc,'lat'));
