From 5e765b7358c0a1f91b30acf48d442c08073fdbed Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 30 九月 2025 16:06:58 +0800
Subject: [PATCH] 优化数据源配置

---
 pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/Hargreaves.java |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/Hargreaves.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/Hargreaves.java
index f5b31a8..36965d6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/Hargreaves.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/modelCalculate/Hargreaves.java
@@ -108,7 +108,7 @@
      * @return
      */
     public static Double ET0(Double kc, Double maxT, Double minT, Double zenithRadiation){
-        Expression expression = new ExpressionBuilder("x * (0.0023 * (((a + b) / 2) + 17.8) * ((a + b)^(1/2)) * c * 0.408)")
+        Expression expression = new ExpressionBuilder("x * (0.0023 * (((a + b) / 2) + 17.8) * ((a - b)^(1/2)) * c * 0.408)")
                 .variables("x", "a", "b", "c")
                 .build();
         // 璁剧疆鍙橀噺鍊�
@@ -120,30 +120,31 @@
         return result ;
     }
 
+
     public static void main(String[] args) {
-        Double lat = 38.561976140977116 ;//绾害
-        Integer dayIndex = 180 ;//骞村唴鏃ュ簭鏁帮紙姣斿1鏈�1鏃ヤ负1锛�12鏈�31鏃ヤ负365鎴�366锛�
+        Double lat = 38.56064095143279 ;//绾害
+        Integer dayIndex = 239 ;//骞村唴鏃ュ簭鏁帮紙姣斿1鏈�1鏃ヤ负1锛�12鏈�31鏃ヤ负365鎴�366锛�
         Double kc = 0.41 ;//浣滅墿绯绘暟
         Double maxT = 40.1 ;//涓�鏃ュ唴鏈�楂樻俯搴�
         Double minT = 28.1 ;//涓�鏃ュ唴鏈�浣庢俯搴�
 
         Double fai = rad(lat);
-        System.out.println(fai);
+        System.out.println("寮у害:" + fai);
 
         Double sunMagnetismAngular = sunMagnetismAngular(dayIndex);
-        System.out.println(sunMagnetismAngular);
-
-        Double sunEarthDistance = sunEarthDistance(dayIndex);
-        System.out.println(sunEarthDistance);
+        System.out.println("澶槼纾佸亸瑙�:" + sunMagnetismAngular);
 
         Double sunTimeAngular = sunTimeAngular(fai, sunMagnetismAngular);
-        System.out.println(sunTimeAngular);
+        System.out.println("澶槼鏃惰:" + sunTimeAngular);
+
+        Double sunEarthDistance = sunEarthDistance(dayIndex);
+        System.out.println("鏃ュ湴闂寸浉瀵硅窛绂荤殑鍊掓暟:" + sunEarthDistance);
 
         Double zenithRadiation = zenithRadiation(sunEarthDistance, sunTimeAngular, fai, sunMagnetismAngular);
-        System.out.println(zenithRadiation);
+        System.out.println("澶╅《杈愬皠:" + zenithRadiation);
 
         Double et0 = ET0(kc, maxT, minT, zenithRadiation);
-        System.out.println(et0);
+        System.out.println("钂告暎閲�:" + et0);
     }
 
 }

--
Gitblit v1.8.0