diff --git a/ecco_v4/cost_xx.m b/ecco_v4/cost_xx.m index 6344928..ec295c3 100644 --- a/ecco_v4/cost_xx.m +++ b/ecco_v4/cost_xx.m @@ -42,7 +42,8 @@ if ~isempty(dir([dirModel nameSigma])); dirSig=dirModel; else; - error(['could not find ' nameSigma]); + warning(['could not find ' nameSigma ' -> abort']); + return; end; if ~isempty(dir([dirModel 'xx_' xxName '.effective.*data'])); diff --git a/gcmfaces_diags/diags_pre_process.m b/gcmfaces_diags/diags_pre_process.m index e5a0829..c4cea4b 100644 --- a/gcmfaces_diags/diags_pre_process.m +++ b/gcmfaces_diags/diags_pre_process.m @@ -42,8 +42,8 @@ dirSnap=dirModel; doBudget=~isempty(dir([dirSnap 'budg2d_snap_set1*'])); end; - doCtrl=~isempty(dir([dirModel 'ADXXfiles' filesep 'xx*.effective.*'])); - doCtrl=doCtrl|~isempty(dir([dirModel 'xx*.effective.*'])); + doCtrl=~isempty(dir([dirModel 'xx_atemp.effective.*'])) + doCtrl=doCtrl&~isempty(dir([dirModel 'cap_sigma_tmp2m_degC_eccollc.bin'])); else; dirSnap=fullfile(dirModel,'diags',filesep); doBudget=0;