Merge pull request #94 from GreyEvenson-NOAA/noah_om_grid_snowt_avg_fix

Patch SNOWT_AVG and ACSNOM
NOAA-OWP · Dec 18, 2023 · 50069ad · 50069ad
2 parents 1739dac + a75492c
commit 50069ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/EnergyType.f90 b/src/EnergyType.f90
@@ -336,7 +336,8 @@ subroutine InitDefault(this)
 
       this%LH        = huge(1.0)    
       this%TGS       = huge(1.0)    
-      this%ICE       = huge(1)    
+      this%ICE       = huge(1)   
+      this%SNOWT_AVG = huge(1.0) 
 
       this%IMELT(:)  = huge(1)
       this%STC(:)    = huge(1.0)
@@ -384,6 +385,7 @@ subroutine TransferIn(this, energygrid, ix, iy)
       integer,               intent(in)    :: ix
       integer,               intent(in)    :: iy
 
+      this%SNOWT_AVG = energygrid%SNOWT_AVG(ix,iy)
       this%TV = energygrid%TV(ix,iy)
       this%TG = energygrid%TG(ix,iy)
       this%FCEV = energygrid%FCEV(ix,iy)
@@ -525,6 +527,7 @@ subroutine TransferOut(this, energygrid, ix, iy)
       integer,               intent(in)    :: ix
       integer,               intent(in)    :: iy
 
+      energygrid%SNOWT_AVG(ix,iy) = this%SNOWT_AVG
       energygrid%TV(ix,iy) = this%TV
       energygrid%TG(ix,iy) = this%TG
       energygrid%FCEV(ix,iy) = this%FCEV

diff --git a/src/SnowWaterModule.f90 b/src/SnowWaterModule.f90
@@ -30,6 +30,7 @@ SUBROUTINE SnowWater (domain, levels, parameters, energy, water, forcing)
 ! ------------------------ local variables ---------------------------
   INTEGER :: IZ,i
   REAL    :: BDSNOW  !bulk density of snow (kg/m3)
+  REAL    :: realMissing = -999999.0
 ! ----------------------------------------------------------------------
 
 ! initialization
@@ -98,7 +99,7 @@ SUBROUTINE SnowWater (domain, levels, parameters, energy, water, forcing)
       energy%SNOWT_AVG = SUM(energy%STC(-levels%nsnow+1:0)*(water%SNICE(-levels%nsnow+1:0)+water%SNLIQ(-levels%nsnow+1:0))) / &
                          SUM(water%SNICE(-levels%nsnow+1:0)+water%SNLIQ(-levels%nsnow+1:0))
    else
-      energy%SNOWT_AVG = huge(1.)
+      energy%SNOWT_AVG = realMissing
    end if
 
   END SUBROUTINE SnowWater

diff --git a/src/WaterType.f90 b/src/WaterType.f90
@@ -137,6 +137,7 @@ subroutine InitDefault(this)
 
     class(water_type), intent(inout) :: this
 
+    this%ACSNOM      = huge(1.0)
     this%qinsur      = huge(1.0)
     this%qseva       = huge(1.0)
     this%EVAPOTRANS  = huge(1.0)
@@ -226,6 +227,7 @@ subroutine TransferIn(this, watergrid, ix, iy)
     integer,              intent(in)    :: ix
     integer,              intent(in)    :: iy
 
+    this%ACSNOM = watergrid%ACSNOM(ix,iy)
     this%qinsur = watergrid%qinsur(ix,iy)
     this%qseva = watergrid%qseva(ix,iy)
     this%EVAPOTRANS = watergrid%EVAPOTRANS(ix,iy)
@@ -306,6 +308,7 @@ subroutine TransferOut(this, watergrid, ix, iy)
     integer,              intent(in)    :: ix
     integer,              intent(in)    :: iy
 
+    watergrid%ACSNOM(ix,iy) = this%ACSNOM
     watergrid%qinsur(ix,iy) = this%qinsur
     watergrid%qseva(ix,iy) = this%qseva
     watergrid%EVAPOTRANS(ix,iy) = this%EVAPOTRANS