--- MITgcm_contrib/enderton/PeriodicCoupling/CalcOcnForcingFields.m 2005/10/18 15:51:19 1.2 +++ MITgcm_contrib/enderton/PeriodicCoupling/CalcOcnForcingFields.m 2005/10/18 16:07:15 1.3 @@ -59,17 +59,16 @@ % What if it is not in year increments? Need a more sophisticated % treatment of finding Focn. Should compute monthly mean before. Test % with various sorts of coupled field outputs. - for ifield = 1:length(mncfld) - FocnOld = dataFocnOld.(mncfld{ifield}); - if isequal(mncfld{ifield},'FW') - FocnOld = DataCorrections(FocnOld,mncfld{ifield},gravity,RAC); - end FocnNew = mean(dataCplSelect.([mncfld{ifield},'tave']),3); FocnNew = DataCorrections(FocnNew,mncfld{ifield},gravity,RAC); if FocnOnly Focn = FocnNew; else + FocnOld = dataFocnOld.(mncfld{ifield}); + if isequal(mncfld{ifield},'FW') + FocnOld = DataCorrections(FocnOld,mncfld{ifield},gravity,RAC); + end Focn = (gWeight*FocnOld + FocnNew)/(gWeight+1); end fid=fopen([outDir,'/',FocnRoot,'.',fields{ifield},...