Changeset 23849

Timestamp:

04/16/19 13:45:17 (6 years ago)

Author:

schlegel

Message:

CHG: calculate fluxes as means instead of sums and add flux output to GEMB tests

Location:

issm/trunk-jpl

Files:

• src/c/classes/Elements/Element.cpp (modified) (5 diffs)
• src/c/modules/SurfaceMassBalancex/Gembx.cpp (modified) (1 diff)
• src/c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• test/Archives/Archive243.arch (modified) ( previous)
• test/Archives/Archive244.arch (modified) ( previous)
• test/NightlyRun/test243.m (modified) (3 diffs)
• test/NightlyRun/test243.py (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -3274 +3274 @@
         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 +3526 @@
 
                 /*Calculate net shortwave [W m-2]*/
-                netSW = netSW + cellsum(swf,m);
+                netSW = netSW + cellsum(swf,m)*smb_dt/dt;
 
                 /*Thermal profile computation:*/
@@ -3550 +3550 @@
 
                 /*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 +3574 @@
                 } /*}}}*/
 
-                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 +3628 @@
         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));

issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp

@@ -824 +824 @@
                 // upward longwave contribution
                 ulw = - (SB * pow(Ts,4.0)* teValue) * dt; // - deltatest here
-                ulwrf = ulwrf - ulw;
+                ulwrf = ulwrf - ulw/dt0;
 
                 dT_ulw = ulw / TCs;

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -1135 +1135 @@
         SmbDzAddEnum,
         SmbFACEnum,
-        SmbNetULWEnum,
+        SmbMeanULWEnum,
         SmbNetLWEnum,
         SmbNetSWEnum,
-        SmbNetLHFEnum,
-        SmbNetSHFEnum,
+        SmbMeanLHFEnum,
+        SmbMeanSHFEnum,
         SMBforcingEnum,
         SMBgcmEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -1139 +1139 @@
                 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";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -1166 +1166 @@
               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;

issm/trunk-jpl/test/NightlyRun/test243.m

@@ -28 +28 @@
 
 %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 +47 @@
 
 %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 +62 @@
         (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))
+};

issm/trunk-jpl/test/NightlyRun/test243.py

@@ -44 +44 @@
 
 #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 +61 @@
 
 #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 +75 @@
                 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]]