Merge pull request #360 from yuanhuas/master

Only print warning for the first time-step for reference height less than htop/hroof+1m.
CoLM-SYSU · Jan 8, 2025 · e529319 · e529319
2 parents 5e80759 + f8b7c46
commit e529319
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/main/MOD_LeafTemperature.F90 b/main/MOD_LeafTemperature.F90
@@ -529,17 +529,20 @@ SUBROUTINE LeafTemperature ( &
 
          IF (hu <= htop+1) THEN
             hu_ = htop + 1.
-            write(6,*) 'Warning: the obs height of u less than htop+1, set it to htop+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of u less than htop+1, set it to htop+1.'
          ENDIF
 
          IF (ht <= htop+1) THEN
             ht_ = htop + 1.
-            write(6,*) 'Warning: the obs height of t less than htop+1, set it to htop+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of t less than htop+1, set it to htop+1.'
          ENDIF
 
          IF (hq <= htop+1) THEN
             hq_ = htop + 1.
-            write(6,*) 'Warning: the obs height of q less than htop+1, set it to htop+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of q less than htop+1, set it to htop+1.'
          ENDIF
 
       ELSE ! relative height

diff --git a/main/MOD_LeafTemperaturePC.F90 b/main/MOD_LeafTemperaturePC.F90
@@ -913,17 +913,20 @@ SUBROUTINE  LeafTemperaturePC ( &
 
          IF (hu <= htop_lay(toplay)+1) THEN
             hu_ = htop_lay(toplay) + 1.
-            write(6,*) 'Warning: the obs height of u less than htop+1, set it to htop+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of u less than htop+1, set it to htop+1.'
          ENDIF
 
          IF (ht <= htop_lay(toplay)+1) THEN
             ht_ = htop_lay(toplay) + 1.
-            write(6,*) 'Warning: the obs height of t less than htop+1, set it to htop+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of t less than htop+1, set it to htop+1.'
          ENDIF
 
          IF (hq <= htop_lay(toplay)+1) THEN
             hq_ = htop_lay(toplay) + 1.
-            write(6,*) 'Warning: the obs height of q less than htop+1, set it to htop+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of q less than htop+1, set it to htop+1.'
          ENDIF
 
       ELSE ! relative height

diff --git a/main/URBAN/MOD_Urban_Flux.F90 b/main/URBAN/MOD_Urban_Flux.F90
@@ -516,17 +516,20 @@ SUBROUTINE UrbanOnlyFlux ( &
 
          IF (hu <= hroof+1) THEN
             hu_ = hroof + 1.
-            write(6,*) 'Warning: the obs height of u less than htop+1, set it to hroof+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of u less than hroof+1, set it to hroof+1.'
          ENDIF
 
          IF (ht <= hroof+1) THEN
             ht_ = hroof + 1.
-            write(6,*) 'Warning: the obs height of t less than htop+1, set it to hroof+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of t less than hroof+1, set it to hroof+1.'
          ENDIF
 
          IF (hq <= hroof+1) THEN
             hq_ = hroof + 1.
-            write(6,*) 'Warning: the obs height of q less than htop+1, set it to hroof+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of q less than hroof+1, set it to hroof+1.'
          ENDIF
 
       ELSE ! relative height
@@ -1515,17 +1518,20 @@ SUBROUTINE  UrbanVegFlux ( &
 
          IF (hu <= hroof+1) THEN
             hu_ = hroof + 1.
-            write(6,*) 'Warning: the obs height of u less than hroof+1, set it to hroof+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of u less than hroof+1, set it to hroof+1.'
          ENDIF
 
          IF (ht <= hroof+1) THEN
             ht_ = hroof + 1.
-            write(6,*) 'Warning: the obs height of t less than hroof+1, set it to hroof+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of t less than hroof+1, set it to hroof+1.'
          ENDIF
 
          IF (hq <= hroof+1) THEN
             hq_ = hroof + 1.
-            write(6,*) 'Warning: the obs height of q less than hroof+1, set it to hroof+1.'
+            IF (taux == spval) & ! only print warning for the firt time-step
+               write(6,*) 'Warning: the obs height of q less than hroof+1, set it to hroof+1.'
          ENDIF
 
       ELSE ! relative height