Cbal v1 - new canopy snow routine

.gitignore

@@ -6,6 +6,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+settings.json
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -269,3 +270,7 @@ __pycache__/
 
 build/
 /crhmcode/src/libs/boost_1_75_0
+.vscode/tasks.json
+.vscode/launch.json
+crhmcode/.vscode/tasks.json
+crhmcode/.vscode/launch.json

crhmcode/Makefile

@@ -53,8 +53,8 @@ ClassalbedoBaker.o Classalbedoobs.o Classalbedoobs2.o Classalbedoparam.o \
 ClassalbedoRichard.o ClassalbedoWinstral.o ClassAnnan.o ClassAyers.o \
 ClassBasin.o Classbrushintcp.o Classcalcsun.o Classcontribution.o \
 Classcrack.o ClassCRHMCanopy.o ClassCRHMCanopyClearing.o \
-ClassCRHMCanopyClearingGap.o Classebsm.o Classevap.o Classevap_Resist.o \
-ClassevapD.o ClassevapD_Resist.o ClassevapX.o ClassFlowInSnow.o \
+ClassCRHMCanopyClearingGap.o ClassCRHMCanopyVectorBased.o Classebsm.o Classevap.o \
+Classevap_Resist.o ClassevapD.o ClassevapD_Resist.o ClassevapX.o ClassFlowInSnow.o \
 Classfrostdepth.o Classfrozen.o ClassfrozenAyers.o Classglacier.o \
 Classglacier_debris.o ClassGlobal.o ClassGreenAmpt.o ClassGreencrack.o \
 ClassGrow_Crop.o ClassHMSA.o ClassHtobs.o ClassIceBulb.o ClassICEflow.o \

crhmcode/prj/badlake.prj

@@ -11,7 +11,7 @@ Macros:
 ######
 Observations:
 ######
-C:\Users\jhs507\repos\crhmcode\crhmcode\obs\Badlake73_76.obs
+/home/alex/Documents/code/crhmcode/crhmcode/obs/Badlake73_76.obs
 ######
 Dates:
 ######

crhmcode/src/core/CRHM_constants.h

@@ -27,6 +27,7 @@ namespace CRHM_constants {
 	const double Cp = 1005;     // (J/kg/K) volumetric heat capacity of dry air
 	const double Rgas = 287.0;  // Gas constant for dry air (J/kg/K)
 	const double Tm = 273.15;   // Melting point (K)
+	const double Tf = 273.16; // Freezing point of water (K) as in CLASS and SNOBAL
 
 	const double Ls = 2.845e6;  // Latent heat of sublimation (J/kg)
 	const double Lv = 2.50e6;  // Latent heat of vaporization (J/kg)
@@ -36,9 +37,14 @@ namespace CRHM_constants {
 	const double sbc = 5.67E-8; // Stephan-Boltzmann constant W/m^2/k4
 	const double SB = 4.899e-09; // Stephan-Boltzmann constant MJ/m^2-d
 
-	const double emiss = 0.985; // emissivity of the atmosphere and snowpack
+	const double emiss = 0.99; // emissivity the snowpack changed from 0.985 on 2025-02-06
 	const double emiss_c = 0.96; // emissivity of the canopy
 	const double em = 0.622;     //
+    const double ci = 2.102e3; // specific heat capacity of ice (J/kg/K)
+	const double cw = 4.186e3; // specific heat capacity of h2o (J/kg/K) from CLASS
+	const double cv = 2.70e3; // specific heat capacity of vegetation (J/kg/K) from CLASS
+
+
 }
 
 #endif // !CRHM_CONSTANTS

crhmcode/src/core/CRHMmain.cpp

@@ -2308,7 +2308,7 @@ MMSData *  CRHMmain::RunClick2Start()
 		}
 	}
 
-
+	
 	Global::DTmin = (int)((DTstartR - Global::DTstart)* Global::Freq);
 	Global::DTindx = Global::DTmin;
 	Global::DTnow = Global::DTstart + Global::Interval*((long long)Global::DTindx + 1ll);
@@ -2351,13 +2351,19 @@ MMSData *  CRHMmain::RunClick2Start()
 		GoodRun = false;
 	}
 
-
+	
 	ClassData * FileData = NULL;
 	if (ObsFilesList->size() > 0)
 	{
 		FileData = ObsFilesList->begin()->second;
+		const double tolerance = 1e-9; // to handle floating point precision when DTstartR and FileData->Dt1 are effectively equal but have slightly different precision and then entered the first if statement below.
+
+		if (fabs(DTstartR - FileData->Dt1) < tolerance) { // check if effectively equal 
+
+			LogMessageX("DTstartR and FileData->Dt1 are effectively equal but there still may be a small difference due to floating point precision");
+
+		} else if (DTstartR < FileData->Dt1 - tolerance) {
 
-		if (DTstartR < FileData->Dt1) {
 			LogMessageX("Start Time before first Observation");
 			GoodRun = false;
 		}

crhmcode/src/modules/CMakeLists.txt

@@ -17,11 +17,14 @@ add_library(modules OBJECT
     ClassBasin.cpp
     Classbrushintcp.cpp
     Classcalcsun.cpp
+    ClassCanSnobalBase.cpp
+    ClassCanSnobalCRHM.cpp
     Classcontribution.cpp
     Classcrack.cpp
     ClassCRHMCanopy.cpp
     ClassCRHMCanopyClearing.cpp
     ClassCRHMCanopyClearingGap.cpp
+    ClassCRHMCanopyVectorBased.cpp
     Classebsm.cpp
     Classevap_Resist.cpp
     Classevap.cpp

crhmcode/src/modules/ClassCRHMCanopyClearingGap.cpp

@@ -120,6 +120,8 @@ void ClassCRHMCanopyClearingGap::decl(void) {
 
   declobs("Qlosn", TDim::NHRU, "reflected long-wave at surface", "(W/m^2)", &Qlosn);
 
+  // declreadobs("obs_snow_load", TDim::NHRU, "Weighed tree canopy snow load", "(kg/m^2)", &obs_snow_load, HRU_OBS_misc);
+
 // declared variables
 
   decldiag("k", TDim::NHRU, "extinction coefficient", "()", &k);
@@ -247,6 +249,16 @@ void ClassCRHMCanopyClearingGap::run(void){
 
   for (hh = 0; chkStruct(); ++hh){
 
+    // uncomment  below to hop to specific time in debug
+
+    // string test = StandardConverterUtility::GetDateTimeInString(Global::DTnow);
+
+    // if (test == "3/14/2023 11:0") {
+    // // if (test == "3/26/2023 15:0") { // TOP OF THE HOUR IS ONE ZERO
+    // // if (test == "10/1/2021 0:15") {
+    //   std::cout << "Breakpoint here: Date matched" << std::endl;
+    // }
+
     switch (variation){
       case VARIATION_ORG:
       Qsi_ =  Qsi[hh];
@@ -661,6 +673,14 @@ void ClassCRHMCanopyClearingGap::run(void){
     net_p[hh] = net_rain[hh] + net_snow[hh];
     cum_net_rain[hh] += net_rain[hh];
     cum_net_snow[hh] += net_snow[hh];
+
+    // // set assimilate observed snow load for begining of select events
+    // if(obs_snow_load[hh] < 9999){
+    //   Snow_load[hh] = obs_snow_load[hh];
+    //   SUnload[hh] = 0.0;
+    //   SUnload_H2O[hh] = 0.0;
+    //   Subl_Cpy[hh] = 0.0;
+    // }
   } // end for
 }
 

crhmcode/src/modules/ClassCRHMCanopyClearingGap.h

@@ -40,6 +40,8 @@ double *Qnsn { NULL };
 double *Qsisn { NULL };
 double *Qlisn { NULL };
 double *Qlosn { NULL };
+const double *obs_snow_load { NULL };
+
 
 // put variables