removed duplicate warning information in soltab

print tmaxf or tmaxc; tminf or tminc into CBH files depending on value of temp_units
rniswon · Dec 1, 2023 · 08a2bd6 · 08a2bd6
1 parent 9885462
commit 08a2bd6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/GSFLOW/src/prms/soltab.f90 b/GSFLOW/src/prms/soltab.f90
@@ -357,9 +357,8 @@ SUBROUTINE compute_soltab(Obliquity, Solar_declination, Slope, Aspect, &
           PRINT *, 'WARNING: solar table value for day:', jd, &
      &             ' computed as:', solt, ' set to', 0.0, &
      &             ' for HRU:', Id, ' hru_type:', Hru_type
-          PRINT *, 'slope, aspect, latitude, cossl', Slope, Aspect, Latitude, Cossl
+          PRINT *, 'slope, aspect, latitude, cossl, sunh', Slope, Aspect, Latitude, Cossl, sunh
           solt = 0.0D0
-          PRINT *, Slope, Aspect, Latitude, Cossl, sunh
           PRINT *, t0, t1, t2, t3, t6, t7, d
         ENDIF
         IF ( sunh<DNEARZERO ) sunh = 0.0D0

diff --git a/GSFLOW/src/prms/write_climate_hru.f90 b/GSFLOW/src/prms/write_climate_hru.f90
@@ -64,15 +64,23 @@ INTEGER FUNCTION write_climate_hru()
           IF ( ios/=0 ) THEN
             ierr = 1
           ELSE
-            WRITE ( tmax_unit, 9001 ) 'tmaxf', Nhru
+            IF ( Temp_units==FAHRENHEIT ) THEN
+              WRITE ( tmax_unit, 9001 ) 'tmaxf', Nhru
+            ELSE
+              WRITE ( tmax_unit, 9001 ) 'tmaxc', Nhru
+            ENDIF
           ENDIF
 
           IF ( control_string(Tmin_day, 'tmin_day')/=0 ) CALL read_error(5, 'tmin_day')
           CALL PRMS_open_output_file(tmin_unit, Tmin_day, 'tmin_day', 0, ios)
           IF ( ios/=0 ) THEN
             ierr = 1
           ELSE
-            WRITE ( tmin_unit, 9001 ) 'tminf', Nhru
+            IF ( Temp_units==FAHRENHEIT ) THEN
+              WRITE ( tmin_unit, 9001 ) 'tminf', Nhru
+            ELSE
+              WRITE ( tmin_unit, 9001 ) 'tminc', Nhru
+            ENDIF
           ENDIF
         ENDIF
 
@@ -136,7 +144,7 @@ INTEGER FUNCTION write_climate_hru()
 
  9001 FORMAT ( 'Generated for climate_hru module', /, A, I8, /, 40('#') )
  9002 FORMAT ( 'Generated for climate_hru module', /, A, I8, /, 'orad 1', /, 40('#') )
- 9003 FORMAT ( '(I4,2I3,3I2,',I8,'E12.5)' )
+ 9003 FORMAT ( '(I4,2I3,3I2,',I8,'F10.5)' )
  9004 FORMAT ( '(I4,2I3,3I2,',I8,'I3)' )
 
       END FUNCTION write_climate_hru