Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 23848) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 23849) @@ -3274,7 +3274,7 @@ IssmDouble netSW=0.0; IssmDouble netLW=0.0; - IssmDouble netULW=0.0; - IssmDouble netLHF=0.0; - IssmDouble netSHF=0.0; + IssmDouble meanULW=0.0; + IssmDouble meanLHF=0.0; + IssmDouble meanSHF=0.0; IssmDouble* W = NULL; IssmDouble* a = NULL; @@ -3526,5 +3526,5 @@ /*Calculate net shortwave [W m-2]*/ - netSW = netSW + cellsum(swf,m); + netSW = netSW + cellsum(swf,m)*smb_dt/dt; /*Thermal profile computation:*/ @@ -3550,6 +3550,6 @@ /*Calculate net longwave [W m-2]*/ - netULW = netULW + ulw; - netLW = netLW + dlw - ulw; + meanULW = meanULW + ulw*smb_dt/dt; + netLW = netLW + (dlw - ulw)*smb_dt/dt; /*Calculate turbulent heat fluxes [W m-2]*/ @@ -3574,6 +3574,6 @@ } /*}}}*/ - netLHF = netLHF + lhf; - netSHF = netSHF + shf; + meanLHF = meanLHF + lhf*smb_dt/dt; + meanSHF = meanSHF + shf*smb_dt/dt; /*Sum component mass changes [kg m-2]*/ @@ -3628,9 +3628,9 @@ this->AddInput(new DoubleInput(SmbRunoffEnum,sumR/dt/rho_ice)); this->AddInput(new DoubleInput(SmbPrecipitationEnum,sumP/dt/rho_ice)); - this->AddInput(new DoubleInput(SmbNetULWEnum,netULW)); + this->AddInput(new DoubleInput(SmbMeanULWEnum,meanULW)); this->AddInput(new DoubleInput(SmbNetLWEnum,netLW)); this->AddInput(new DoubleInput(SmbNetSWEnum,netSW)); - this->AddInput(new DoubleInput(SmbNetLHFEnum,netLHF)); - this->AddInput(new DoubleInput(SmbNetSHFEnum,netSHF)); + this->AddInput(new DoubleInput(SmbMeanLHFEnum,meanLHF)); + this->AddInput(new DoubleInput(SmbMeanSHFEnum,meanSHF)); this->AddInput(new DoubleInput(SmbDzAddEnum,sumdz_add)); this->AddInput(new DoubleInput(SmbMAddEnum,sumMassAdd/dt)); Index: /issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp (revision 23848) +++ /issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp (revision 23849) @@ -824,5 +824,5 @@ // upward longwave contribution ulw = - (SB * pow(Ts,4.0)* teValue) * dt; // - deltatest here - ulwrf = ulwrf - ulw; + ulwrf = ulwrf - ulw/dt0; dT_ulw = ulw / TCs; Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23848) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 23849) @@ -1135,9 +1135,9 @@ SmbDzAddEnum, SmbFACEnum, - SmbNetULWEnum, + SmbMeanULWEnum, SmbNetLWEnum, SmbNetSWEnum, - SmbNetLHFEnum, - SmbNetSHFEnum, + SmbMeanLHFEnum, + SmbMeanSHFEnum, SMBforcingEnum, SMBgcmEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23848) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 23849) @@ -1139,9 +1139,9 @@ case SmbDzAddEnum : return "SmbDzAdd"; case SmbFACEnum : return "SmbFAC"; - case SmbNetULWEnum : return "SmbNetULW"; + case SmbMeanULWEnum : return "SmbMeanULW"; case SmbNetLWEnum : return "SmbNetLW"; case SmbNetSWEnum : return "SmbNetSW"; - case SmbNetLHFEnum : return "SmbNetLHF"; - case SmbNetSHFEnum : return "SmbNetSHF"; + case SmbMeanLHFEnum : return "SmbMeanLHF"; + case SmbMeanSHFEnum : return "SmbMeanSHF"; case SMBforcingEnum : return "SMBforcing"; case SMBgcmEnum : return "SMBgcm"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23848) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 23849) @@ -1166,9 +1166,9 @@ else if (strcmp(name,"SmbDzAdd")==0) return SmbDzAddEnum; else if (strcmp(name,"SmbFAC")==0) return SmbFACEnum; - else if (strcmp(name,"SmbNetULW")==0) return SmbNetULWEnum; + else if (strcmp(name,"SmbMeanULW")==0) return SmbMeanULWEnum; else if (strcmp(name,"SmbNetLW")==0) return SmbNetLWEnum; else if (strcmp(name,"SmbNetSW")==0) return SmbNetSWEnum; - else if (strcmp(name,"SmbNetLHF")==0) return SmbNetLHFEnum; - else if (strcmp(name,"SmbNetSHF")==0) return SmbNetSHFEnum; + else if (strcmp(name,"SmbMeanLHF")==0) return SmbMeanLHFEnum; + else if (strcmp(name,"SmbMeanSHF")==0) return SmbMeanSHFEnum; else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum; else if (strcmp(name,"SMBgcm")==0) return SMBgcmEnum; Index: /issm/trunk-jpl/test/NightlyRun/test243.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test243.m (revision 23848) +++ /issm/trunk-jpl/test/NightlyRun/test243.m (revision 23849) @@ -28,5 +28,7 @@ %smb settings -md.smb.requested_outputs={'SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbEC','SmbA','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC'}; +md.smb.requested_outputs={'SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbEC',... + 'SmbA','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC','SmbMeanSHF','SmbMeanLHF',... + 'SmbMeanULW','SmbNetLW','SmbNetSW'}; %only run smb core: @@ -45,6 +47,6 @@ %Fields and tolerances to track changes -field_names ={'SmbDz','SmbT' ,'SmbD' ,'SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC'}; -field_tolerances ={1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,2e-12,1e-12,1e-12,1e-12,1e-11}; +field_names ={'SmbDz','SmbT' ,'SmbD' ,'SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC','SmbMeanSHF','SmbMeanLHF','SmbMeanULW','SmbNetLW','SmbNetSW'}; +field_tolerances ={1e-11,1e-12,1e-11,2e-11,1e-11,1e-11,1e-12,4e-12,1e-12,1e-12,1e-12,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11}; field_values={... @@ -60,4 +62,9 @@ (md.results.TransientSolution(end).SmbMAdd(1)),... (md.results.TransientSolution(end).SmbDzAdd(1)),... - (md.results.TransientSolution(end).SmbFAC(1)) - }; + (md.results.TransientSolution(end).SmbFAC(1)),... + (md.results.TransientSolution(end).SmbMeanSHF(1)),... + (md.results.TransientSolution(end).SmbMeanLHF(1)),... + (md.results.TransientSolution(end).SmbMeanULW(1)),... + (md.results.TransientSolution(end).SmbNetLW(1)),... + (md.results.TransientSolution(end).SmbNetSW(1)) +}; Index: /issm/trunk-jpl/test/NightlyRun/test243.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test243.py (revision 23848) +++ /issm/trunk-jpl/test/NightlyRun/test243.py (revision 23849) @@ -44,5 +44,5 @@ #smb settings -md.smb.requested_outputs = ['SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbEC', 'SmbA', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC'] +md.smb.requested_outputs = ['SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbEC', 'SmbA', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC', 'SmbMeanSHF', 'SmbMeanLHF', 'SmbMeanULW', 'SmbNetLW', 'SmbNetSW'] #only run smb core: @@ -61,6 +61,6 @@ #Fields and tolerances to track changes -field_names = ['SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbA', 'SmbEC', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC'] -field_tolerances = [1e-11, 1e-12, 1e-11, 2e-11, 1e-11, 1e-11, 1e-12, 2e-12, 1e-12, 1e-12, 1e-12, 1e-11] +field_names = ['SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbA', 'SmbEC', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC', 'SmbMeanSHF', 'SmbMeanLHF', 'SmbMeanULW', 'SmbNetLW', 'SmbNetSW'] +field_tolerances = [1e-11, 1e-12, 1e-11, 2e-11, 1e-11, 1e-11, 1e-12, 2e-12, 1e-12, 1e-12, 1e-12, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11] #shape is different in python solution (fixed using reshape) which can cause test failure: field_values = [md.results.TransientSolution[-1].SmbDz[0, 0:240].reshape(1, -1), @@ -75,3 +75,8 @@ md.results.TransientSolution[-1].SmbMAdd[0], md.results.TransientSolution[-1].SmbDzAdd[0], - md.results.TransientSolution[-1].SmbFAC[0]] + md.results.TransientSolution[-1].SmbFAC[0], + md.results.TransientSolution[-1].SmbMeanSHF[0], + md.results.TransientSolution[-1].SmbMeanLHF[0], + md.results.TransientSolution[-1].SmbMeanULW[0], + md.results.TransientSolution[-1].SmbNetLW[0], + md.results.TransientSolution[-1].SmbNetSW[0]]