--- MITgcm_contrib/enderton/Diagnostics/DiagLoad.m 2005/02/02 15:38:21 1.4 +++ MITgcm_contrib/enderton/Diagnostics/DiagLoad.m 2005/02/02 16:20:12 1.5 @@ -241,7 +241,7 @@ % is calculated as T=Theta*(p/po)^(R/cp). Moist potential temperature is % calculated as Theta_e=Theta*e^(L*q*/cp*T) where q*=(R/Rv)*(es/p) and % es=Ae^(beta*T). -elseif ismember(fln,{'ActT','MoiPTc'}) +elseif ismember(fln,{'ActT','ThetaEc'}) if isequal('flu','O'), error('Calculation may only be done for atmosphere!'); end @@ -256,13 +256,13 @@ ddf,filesuffix,mnchandle); end theta = DiagAverage(theta,fln,avg,months,ddf,Dim); - if ismember(fln,{'ActT','MoiPTc'}) + if ismember(fln,{'ActT','ThetaEc'}) pres = NaN.*zeros(size(theta)); for iz=1:length(ZC), pres(:,:,iz)=ZC(iz); end temp=theta.*(pres./presrefA).^(RdA/cpA); if isequal(fln,'ActT'), data=temp; end end - if isequal(fln,'MoiPTc') + if isequal(fln,'ThetaEc') es=A_CC.*exp(Beta_CC.*(temp-K2C)); qstar=(RdA/RvA).*(es./pres); data=theta.*exp(LHvapA.*qstar./cpA./temp);