From 86977cdc23d9c68ca22dfdd16f45a60a1faf0e08 Mon Sep 17 00:00:00 2001
From: tp <1799149022@qq.com>
Date: Thu, 12 Jun 2025 13:41:05 +0800
Subject: [PATCH] 2

---
 Dockerfile                        |   4 +
 Fortran/1.json                    | 106 ++++++++++++++++++-
 Fortran/1.xlsx                    | Bin 10912 -> 7501 bytes
 Fortran/MSJGMX.f90                | 163 ++++++++++++++++++------------
 Fortran/Mc_method.f90             |  22 ++--
 Fortran/XAJ.f90                   |  85 +++++++++++-----
 Fortran/XAJMX.f90                 |  86 +++++++---------
 HttpRequests/fortranwebapi.http   |  14 ++-
 Services/FortranInteropService.cs |  42 +++++++-
 9 files changed, 368 insertions(+), 154 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c87e12b..79fbcfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,10 @@
 # ===== 第一阶段：构建阶段 =====
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 
+# 配置 NuGet 使用国内镜像源
+RUN dotnet nuget add source https://mirrors.cloud.tencent.com/nuget/ \
+    && dotnet nuget disable source nuget.org
+
 # 配置 apt-get 使用 apt-cacher-ng 作为代理
 RUN echo 'Acquire::http::Proxy "http://192.168.1.140:3142";' > /etc/apt/apt.conf.d/01proxy
 
diff --git a/Fortran/1.json b/Fortran/1.json
index 764c1d3..d41f2ea 100644
--- a/Fortran/1.json
+++ b/Fortran/1.json
@@ -1,9 +1,9 @@
 {
-  "fortranSourceFile": "D:\\\u5DE5\u4F5C2025\\\u7B97\u6CD5\u5E73\u53F0\\dll\\\u9A6C\u65AF\u4EAC\u8DDF\u6A21\u578B\\MSJGMX\\MSJGMX\\MSJGMX - \u526F\u672C.f90",
+  "fortranSourceFile": "D:\\\u5DE5\u4F5C2025\\\u7B97\u6CD5\u5E73\u53F0\\dll\\\u9A6C\u65AF\u4EAC\u6839-\u65B0\u5B89\u6C5F\u6A21\u578B\\ceshi\\Console1\\Console1\\MSJGMX - \u526F\u672C.f90",
   "fortranFunctionName": "MSJGMX",
   "projectName": "FortranWebApi",
-  "outputDirectory": "D:\\\u5DE5\u4F5C2025\\\u7B97\u6CD5\u5E73\u53F0\\\u8F93\u51FA\u5E93\\\u9A6C\u65AF\u4EAC\u8DDF\u6A21\u578B",
-  "cmbLanguage": "",
+  "outputDirectory": "D:\\\u5DE5\u4F5C2025\\\u7B97\u6CD5\u5E73\u53F0\\\u8F93\u51FA\u5E93\\\u9A6C\u65AF\u4EAC\u6839\u65B0\u5B89\u6C5F\u6A21\u578B",
+  "cmbLanguage": "Fortran",
   "parameters": [
     {
       "name": "FILELEN",
@@ -30,9 +30,105 @@
       "isSelected": true
     },
     {
-      "name": "PAR",
+      "name": "WUM",
       "dataType": "Float",
-      "arrayType": "OneDimensional",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "W1",
+      "dataType": "Float",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "WDM",
+      "dataType": "Float",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "KC",
+      "dataType": "Float",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "C",
+      "dataType": "Float",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "B",
+      "dataType": "Float",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "IMP1",
+      "dataType": "Float",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "SM",
+      "dataType": "Float",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "EX",
+      "dataType": "Float",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "KG",
+      "dataType": "Float",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "KSS",
+      "dataType": "Float",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "KKG",
+      "dataType": "Float",
+      "arrayType": "Scalar",
+      "direction": "Input",
+      "description": "",
+      "isSelected": true
+    },
+    {
+      "name": "KKSS",
+      "dataType": "Float",
+      "arrayType": "Scalar",
       "direction": "Input",
       "description": "",
       "isSelected": true
diff --git a/Fortran/1.xlsx b/Fortran/1.xlsx
index b7dbb866df202d8cae1932e7c87abdebd76826b1..279f36fdddca59e9f97f612f236e98fa08e7857a 100644
GIT binary patch
literal 7501
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

literal 10912
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
QkzbUKkS}(A<gb4J2WPh?fdBvi

diff --git a/Fortran/MSJGMX.f90 b/Fortran/MSJGMX.f90
index d11f59b..e4e11f2 100644
--- a/Fortran/MSJGMX.f90
+++ b/Fortran/MSJGMX.f90
@@ -1,28 +1,39 @@
 subroutine MSJGMX(  FILELEN    ,&
-                    NODE    ,&		! 单元出流数组大小								//输入变量
-                    M		,&		! 无因次单位数组大小							//输入变量
-                    PAR		,&		!												//输入变量
-                    NAREA	,&		! 单元面积个数                                  //输入变量
-                    AREA	,&		! 单元面积										//输入变量
-                    UH		,&		! 无因次单位线									//输入变量
-                    DT		,&		! 时段步长										//输入变量
-                    P		,&		! 降雨系列										//输入变量
-                    EP		,&		! 蒸发皿蒸发能力								//输入变量
-                    W		,&		! 土壤含水层	1.上层	2.下层	3.深层			//输入变量
-                    FR		,&		! 初始产流面积									//输入变量
-                    S		,&		! 初始自由水深									//输入变量
-                    QRSS0	,&		! 初始壤中流流量								//输入变量
-                    QRG0	,&		! 初始地下水径流量								//输入变量
-                    Q20     ,&      ! 出流流量初始值              浮点数            //输入     
-                    X       ,&      ! 流量比重因子          浮点数                  //输入参数
-                    K       ,&      ! 流量模数              浮点数                  //输入参数
-                    DETAT   ,&      ! 时间步长      （小时）    浮点数              //输入参数
-                    C0      ,&      ! 系数                      浮点数              //输出参数 
-                    C1      ,&      !                           浮点数              //输出参数 
-                    C2      ,&      !                          浮点数               //输出参数 
-                    QOUT      )&       ! 出流流量                 浮点数               //输出 
-                    BIND(C, NAME="MSJGMX")
-    
+                    NODE    ,&		! ��Ԫ���������С								//�������
+                    M		,&		! ����ε�λ�����С							//�������
+                    WUM		,&		! �ϲ�����ˮ����wum							//�������
+                    W1		,&		! �²�����ˮ����wl							//�������
+                    WDM		,&		! �������ˮ����wdm							//�������
+                    KC	    ,&		!������������ϵ��KC							//�������
+                    C	    ,&		!�������ϵ��c							    //�������
+                    B	    ,&		!����ˮ��ˮ����ϵ��b						    //�������
+                    IMP1    ,&		!��͸ˮ�������imp1							//�������
+                    SM	    ,&		!����ˮ��ˮ����sm								//�������
+                    EX	    ,&		!����ˮ��ˮ����ָ��ex							//�������
+                    KG	    ,&		!����ˮ����ϵ��kg								//�������
+                    KSS	    ,&		!����������ϵ��kss								//�������
+                    KKG	    ,&		!����ˮ����ϵ��kkg								//�������
+                    KKSS    ,&		!����������ϵ��kkss								//�������
+                    NAREA	,&		! ��Ԫ�������                                  //�������
+                    AREA	,&		! ��Ԫ���										//�������
+                    UH		,&		! ����ε�λ��									//�������
+                    DT		,&		! ʱ�β���										//�������
+                    P		,&		! ����ϵ��										//�������
+                    EP		,&		! ��������������								//�������
+                    W		,&		! ������ˮ��	1.�ϲ�	2.�²�	3.���			//�������
+                    FR		,&		! ��ʼ�������									//�������
+                    S		,&		! ��ʼ����ˮ��									//�������
+                    QRSS0	,&		! ��ʼ����������								//�������
+                    QRG0	,&		! ��ʼ����ˮ������								//�������
+                    Q20     ,&      ! ����������ʼֵ              ������            //����     
+                    X       ,&      ! ������������          ������                  //�������
+                    K       ,&      ! ����ģ��              ������                  //�������
+                    DETAT   ,&      ! ʱ�䲽��      ��Сʱ��    ������              //�������
+                    C0      ,&      ! ϵ��                      ������              //������� 
+                    C1      ,&      !                           ������              //������� 
+                    C2      ,&      !                          ������               //������� 
+                    QOUT      )&       ! ��������                 ������               //��� 
+    BIND(C, NAME="MSJGMX")
   ! Expose subroutine MSJGMX to users of this DLL
   
   !DEC$ ATTRIBUTES DLLEXPORT::MSJGMX
@@ -44,48 +55,74 @@ subroutine MSJGMX(  FILELEN    ,&
     
     INTEGER::NODE					! 
 	INTEGER::M	,	I			!
-	REAL::PAR(13)				! 1.上层张力水容量wum	2.下层张力水容量wl	3.深层张力水容量wdm
-								! 4.蒸发能力折算系数KC.深层蒸发系数c		6.张力水蓄水容量系数b
-								! 7.不透水面积比率imp1	8.自由水蓄水容量sm	9.自由水蓄水容量指数ex
-								!10.地下水出流系数kg 11.壤中流出流系数kss	12.地下水出流系数kkg
-								!13.壤中流出流系数kkss
+	REAL::PAR(13)				! 1.�ϲ�����ˮ����wum	2.�²�����ˮ����wl	3.�������ˮ����wdm
+								! 4.������������ϵ��KC.�������ϵ��c		6.����ˮ��ˮ����ϵ��b
+								! 7.��͸ˮ�������imp1	8.����ˮ��ˮ����sm	9.����ˮ��ˮ����ָ��ex
+								!10.����ˮ����ϵ��kg 11.����������ϵ��kss	12.����ˮ����ϵ��kkg
+								!13.����������ϵ��kkss
     
-    INTEGER::NAREA                      ! 单元面积个数
-    REAL::AREA(NAREA)					! 单元面积
-	REAL::UH(M)					! 无因次单位线
-	REAL::DT					! 时段步长
-	REAL::P(NAREA,NODE)					! 降雨系列
-	REAL::EP(NAREA,NODE)					! 蒸发皿蒸发能力
-	REAL::W(3)					! 土壤含水层	1.上层	2.下层	3.深层
-	REAL::FR					! 初始产流面积
-	REAL::S						! 初始自由水深
-	REAL::QRSS0					! 初始壤中流流量
-	REAL::QRG0					! 初始地下水径流量
+    REAL::WUM                    !�ϲ�����ˮ����wum	
+ 	REAL::W1                     !�²�����ˮ����wl	
+ 	REAL::WDM                   ! �������ˮ����wdm
+	REAL::KC					! ������������ϵ��
+	REAL::C						! �������ϵ��	
+	REAL::B						! ����ˮ��ˮ����ϵ��
+ 	REAL::IMP1					! ��͸ˮ�������		
+	REAL::SM					! ����ˮ��ˮ����
+	REAL::EX					! ����ˮ��ˮ����ָ��
+	REAL::KG					! ����ˮ����ϵ��
+	REAL::KSS					! ����������ϵ��
+	REAL::KKG					! ����ˮ����ϵ��	
+	REAL::KKSS					! ����������ϵ��		
+    
+    INTEGER::NAREA                      ! ��Ԫ�������
+    REAL::AREA(NAREA)					! ��Ԫ���
+	REAL::UH(M)					! ����ε�λ��
+	REAL::DT					! ʱ�β���
+	REAL::P(NAREA,NODE)					! ����ϵ��
+	REAL::EP(NAREA,NODE)					! ��������������
+	REAL::W(3)					! ������ˮ��	1.�ϲ�	2.�²�	3.���
+	REAL::FR					! ��ʼ�������
+	REAL::S						! ��ʼ����ˮ��
+	REAL::QRSS0					! ��ʼ����������
+	REAL::QRG0					! ��ʼ����ˮ������
     REAL::Q20(NAREA)
-    REAL::QOUT(NAREA)   
+    REAL::QOUT(NODE)   
     
    CALL  XAJ(   FILELEN    ,&
-                NODE    ,&		! 单元出流数组大小								//输入变量
-			    M		,&		! 无因次单位数组大小							//输入变量
-			    PAR		,&		!												//输入变量
-			    NAREA	,&		! 单元面积个数                                  //输入变量
-                AREA	,&		! 单元面积										//输入变量
-			    UH		,&		! 无因次单位线									//输入变量
-			    DT		,&		! 时段步长										//输入变量
-			    P		,&		! 降雨系列										//输入变量
-			    EP		,&		! 蒸发皿蒸发能力								//输入变量
-			    W		,&		! 土壤含水层	1.上层	2.下层	3.深层			//输入变量
-			    FR		,&		! 初始产流面积									//输入变量
-			    S		,&		! 初始自由水深									//输入变量
-			    QRSS0	,&		! 初始壤中流流量								//输入变量
-			    QRG0	,&		! 初始地下水径流量								//输入变量
-                Q20     ,&      ! 出流流量初始值              浮点数            //输入     
-                X       ,&      ! 流量比重因子          浮点数                  //输入参数
-                K       ,&      ! 流量模数              浮点数                  //输入参数
-                DETAT   ,&      ! 时间步长      （小时）    浮点数              //输入参数
-                C0      ,&      ! 系数                      浮点数              //输出参数  
-                C1      ,&      !                           浮点数              //输出参数  
-                C2      ,&      !                          浮点数               //输出参数  
-                QOUT      )       ! 出流流量                 浮点数               //输出 
+                NODE    ,&		! ��Ԫ���������С								//�������
+                M		,&		! ����ε�λ�����С							//�������
+                WUM		,&		! �ϲ�����ˮ����wum							//�������
+                W1		,&		! �²�����ˮ����wl							//�������
+                WDM		,&		! �������ˮ����wdm							//�������
+                KC	    ,&		!������������ϵ��KC							//�������
+                C	    ,&		!�������ϵ��c							    //�������
+                B	    ,&		!����ˮ��ˮ����ϵ��b						    //�������
+                IMP1    ,&		!��͸ˮ�������imp1							//�������
+                SM	    ,&		!����ˮ��ˮ����sm								//�������
+                EX	    ,&		!����ˮ��ˮ����ָ��ex							//�������
+                KG	    ,&		!����ˮ����ϵ��kg								//�������
+                KSS	    ,&		!����������ϵ��kss								//�������
+                KKG	    ,&		!����ˮ����ϵ��kkg								//�������
+                KKSS    ,&		!����������ϵ��kkss								//�������
+                NAREA	,&		! ��Ԫ�������                                  //�������
+                AREA	,&		! ��Ԫ���										//�������
+                UH		,&		! ����ε�λ��									//�������
+                DT		,&		! ʱ�β���										//�������
+                P		,&		! ����ϵ��										//�������
+                EP		,&		! ��������������								//�������
+                W		,&		! ������ˮ��	1.�ϲ�	2.�²�	3.���			//�������
+                FR		,&		! ��ʼ�������									//�������
+                S		,&		! ��ʼ����ˮ��									//�������
+                QRSS0	,&		! ��ʼ����������								//�������
+                QRG0	,&		! ��ʼ����ˮ������								//�������
+                Q20     ,&      ! ����������ʼֵ              ������            //����     
+                X       ,&      ! ������������          ������                  //�������
+                K       ,&      ! ����ģ��              ������                  //�������
+                DETAT   ,&      ! ʱ�䲽��      ��Сʱ��    ������              //�������
+                C0      ,&      ! ϵ��                      ������              //������� 
+                C1      ,&      !                           ������              //������� 
+                C2      ,&      !                          ������               //������� 
+                QOUT      )       ! ��������                 ������               //��� 
     
 end subroutine MSJGMX
diff --git a/Fortran/Mc_method.f90 b/Fortran/Mc_method.f90
index 762522f..c51be50 100644
--- a/Fortran/Mc_method.f90
+++ b/Fortran/Mc_method.f90
@@ -11,17 +11,17 @@
 !  PURPOSE:  Entry point for the console application.
 !
 !**************************************************************************** 
-SUBROUTINE Mc_method( NFILENAME   ,&      ! 文件名字长度            整数          //输入参数
-                    N           ,&          ! 入流流量数据点个数     整数         //输入参数
-                    Q1          ,&          ! 入流流量              浮点数            //输入参数
-                    Q20         ,&        ! 出流流量初始值              浮点数         //输入     
-                    X           ,&          ! 流量比重因子          浮点数           //输入参数
-                    K           ,&          ! 流量模数              浮点数             //输入参数
-                    DETAT       ,&          ! 时间步长      （小时）    浮点数             //输入参数
-                    C0          ,&          ! 系数                      浮点数          //输出参数  
-                    C1          ,&          !                           浮点数         //输出参数  
-                    C2          ,&           !                          浮点数           //输出参数  
-                    Q2          )           ! 出流流量                 浮点数                 //输出
+SUBROUTINE Mc_method( NFILENAME   ,&      ! �ļ����ֳ���            ����          //�������
+                    N           ,&          ! �����������ݵ����     ����         //�������
+                    Q1          ,&          ! ��������              ������            //�������
+                    Q20         ,&        ! ����������ʼֵ              ������         //����     
+                    X           ,&          ! ������������          ������           //�������
+                    K           ,&          ! ����ģ��              ������             //�������
+                    DETAT       ,&          ! ʱ�䲽��      ��Сʱ��    ������             //�������
+                    C0          ,&          ! ϵ��                      ������          //�������  
+                    C1          ,&          !                           ������         //�������  
+                    C2          ,&           !                          ������           //�������  
+                    Q2          )           ! ��������                 ������                 //���
 
     INTEGER::NFILENAME
     CHARACTER(LEN = NFILENAME)::FILENAME
diff --git a/Fortran/XAJ.f90 b/Fortran/XAJ.f90
index 8616058..f326c94 100644
--- a/Fortran/XAJ.f90
+++ b/Fortran/XAJ.f90
@@ -1,26 +1,38 @@
-SUBROUTINE XAJ(FILELEN    ,&
+SUBROUTINE XAJ(   FILELEN    ,&
                 NODE    ,&		! ��Ԫ���������С								//�������
-				M		,&		! ����ε�λ�����С							//�������
-				PAR		,&		!												//�������
-				NAREA	,&		! ��Ԫ�������                                  //�������
-				AREA	,&		! ��Ԫ���										//�������
-				UH		,&		! ����ε�λ��									//�������
-				DT		,&		! ʱ�β���										//�������
-				P		,&		! ����ϵ��										//�������
-				EP		,&		! ��������������								//�������
-				W		,&		! ������ˮ��	1.�ϲ�	2.�²�	3.���			//�������
-				FR		,&		! ��ʼ�������									//�������
-				S		,&		! ��ʼ����ˮ��									//�������
-				QRSS0	,&		! ��ʼ����������								//�������
-				QRG0	,&		! ��ʼ����ˮ������								//�������
-                Q20     ,&      ! ����������ʼֵ              ������         //����     
-                X       ,&      ! ������������          ������           //�������
-                K       ,&      ! ����ģ��              ������             //�������
-                DETAT   ,&      ! ʱ�䲽��      ��Сʱ��    ������             //�������
-                C0      ,&      ! ϵ��                      ������          //�������  
-                C1      ,&      !                           ������         //�������  
-                C2      ,&      !                          ������           //�������  
-                QOUT      )       ! ��������                 ������                 //��� 
+                M		,&		! ����ε�λ�����С							//�������
+                WUM		,&		! �ϲ�����ˮ����wum							//�������
+                W1		,&		! �²�����ˮ����wl							//�������
+                WDM		,&		! �������ˮ����wdm							//�������
+                KC	    ,&		!������������ϵ��KC							//�������
+                C	    ,&		!�������ϵ��c							    //�������
+                B	    ,&		!����ˮ��ˮ����ϵ��b						    //�������
+                IMP1    ,&		!��͸ˮ�������imp1							//�������
+                SM	    ,&		!����ˮ��ˮ����sm								//�������
+                EX	    ,&		!����ˮ��ˮ����ָ��ex							//�������
+                KG	    ,&		!����ˮ����ϵ��kg								//�������
+                KSS	    ,&		!����������ϵ��kss								//�������
+                KKG	    ,&		!����ˮ����ϵ��kkg								//�������
+                KKSS    ,&		!����������ϵ��kkss								//�������
+                NAREA	,&		! ��Ԫ�������                                  //�������
+                AREA	,&		! ��Ԫ���										//�������
+                UH		,&		! ����ε�λ��									//�������
+                DT		,&		! ʱ�β���										//�������
+                P		,&		! ����ϵ��										//�������
+                EP		,&		! ��������������								//�������
+                W		,&		! ������ˮ��	1.�ϲ�	2.�²�	3.���			//�������
+                FR		,&		! ��ʼ�������									//�������
+                S		,&		! ��ʼ����ˮ��									//�������
+                QRSS0	,&		! ��ʼ����������								//�������
+                QRG0	,&		! ��ʼ����ˮ������								//�������
+                Q20     ,&      ! ����������ʼֵ              ������            //����     
+                X       ,&      ! ������������          ������                  //�������
+                K       ,&      ! ����ģ��              ������                  //�������
+                DETAT   ,&      ! ʱ�䲽��      ��Сʱ��    ������              //�������
+                C0      ,&      ! ϵ��                      ������              //������� 
+                C1      ,&      !                           ������              //������� 
+                C2      ,&      !                          ������               //������� 
+                QOUT      )       ! ��������                 ������               //��� 
 
     IMPLICIT NONE
 
@@ -42,6 +54,21 @@ SUBROUTINE XAJ(FILELEN    ,&
 								! 7.��͸ˮ�������imp1	8.����ˮ��ˮ����sm	9.����ˮ��ˮ����ָ��ex
 								!10.����ˮ����ϵ��kg 11.����������ϵ��kss	12.����ˮ����ϵ��kkg
 								!13.����������ϵ��kkss
+    
+    REAL::WUM                    !�ϲ�����ˮ����wum	
+ 	REAL::W1                     !�²�����ˮ����wl	
+ 	REAL::WDM                   ! �������ˮ����wdm
+	REAL::KC					! ������������ϵ��
+	REAL::C						! �������ϵ��	
+	REAL::B						! ����ˮ��ˮ����ϵ��
+ 	REAL::IMP1					! ��͸ˮ�������		
+	REAL::SM					! ����ˮ��ˮ����
+	REAL::EX					! ����ˮ��ˮ����ָ��
+	REAL::KG					! ����ˮ����ϵ��
+	REAL::KSS					! ����������ϵ��
+	REAL::KKG					! ����ˮ����ϵ��	
+	REAL::KKSS					! ����������ϵ��		
+    
     integer::NAREA			! ��Ԫ�������                                  //�������
     REAL::AREA(NAREA)					! ��Ԫ���
     REAL::Q1(NAREA,NODE)
@@ -69,7 +96,19 @@ SUBROUTINE XAJ(FILELEN    ,&
         CALL XAJMX(   FILELEN    ,&
                         NODE		,&		! ��Ԫ���������С								//�������
 					    M		,&		! ����ε�λ�����С							//�������
-					    PAR		,&		!												//�������
+					    WUM		,&		! �ϲ�����ˮ����wum							//�������
+                        W1		,&		! �²�����ˮ����wl							//�������
+                        WDM		,&		! �������ˮ����wdm							//�������
+                        KC	    ,&		!������������ϵ��KC							//�������
+                        C	    ,&		!�������ϵ��c							    //�������
+                        B	    ,&		!����ˮ��ˮ����ϵ��b						    //�������
+                        IMP1    ,&		!��͸ˮ�������imp1							//�������
+                        SM	    ,&		!����ˮ��ˮ����sm								//�������
+                        EX	    ,&		!����ˮ��ˮ����ָ��ex							//�������
+                        KG	    ,&		!����ˮ����ϵ��kg								//�������
+                        KSS	    ,&		!����������ϵ��kss								//�������
+                        KKG	    ,&		!����ˮ����ϵ��kkg								//�������
+                        KKSS    ,&		!����������ϵ��kkss								//�������
 					    AREA(I)	,&		! ��Ԫ���										//�������
 					    UH		,&		! ����ε�λ��									//�������
 					    DT		,&		! ʱ�β���										//�������
diff --git a/Fortran/XAJMX.f90 b/Fortran/XAJMX.f90
index ea84f14..d5a738d 100644
--- a/Fortran/XAJMX.f90
+++ b/Fortran/XAJMX.f90
@@ -1,7 +1,19 @@
 SUBROUTINE XAJMX(   FILELEN    ,&
                     N		,&		! ��Ԫ���������С								//�������
 					M		,&		! ����ε�λ�����С							//�������
-					PAR		,&		!												//�������
+					WUM		,&		! �ϲ�����ˮ����wum							//�������
+                    W1		,&		! �²�����ˮ����wl							//�������
+                    WDM		,&		! �������ˮ����wdm							//�������
+                    KC	    ,&		!������������ϵ��KC							//�������
+                    C	    ,&		!�������ϵ��c							    //�������
+                    B	    ,&		!����ˮ��ˮ����ϵ��b						    //�������
+                    IMP1    ,&		!��͸ˮ�������imp1							//�������
+                    SM	    ,&		!����ˮ��ˮ����sm								//�������
+                    EX	    ,&		!����ˮ��ˮ����ָ��ex							//�������
+                    KG	    ,&		!����ˮ����ϵ��kg								//�������
+                    KSS	    ,&		!����������ϵ��kss								//�������
+                    KKG	    ,&		!����ˮ����ϵ��kkg								//�������
+                    KKSS    ,&		!����������ϵ��kkss								//�������
 					AREA	,&		! ��Ԫ���										//�������
 					UH		,&		! ����ε�λ��									//�������
 					DT		,&		! ʱ�β���										//�������
@@ -24,6 +36,21 @@ SUBROUTINE XAJMX(   FILELEN    ,&
 								! 7.��͸ˮ�������imp1	8.����ˮ��ˮ����sm	9.����ˮ��ˮ����ָ��ex
 								!10.����ˮ����ϵ��kg 11.����������ϵ��kss	12.����ˮ����ϵ��kkg
 								!13.����������ϵ��kkss
+    
+    REAL::WUM                    !�ϲ�����ˮ����wum	
+ 	REAL::W1                     !�²�����ˮ����wl	
+ 	REAL::WDM                   ! �������ˮ����wdm
+	REAL::KC					! ������������ϵ��
+	REAL::C						! �������ϵ��	
+	REAL::B						! ����ˮ��ˮ����ϵ��
+ 	REAL::IMP1					! ��͸ˮ�������		
+	REAL::SM					! ����ˮ��ˮ����
+	REAL::EX					! ����ˮ��ˮ����ָ��
+	REAL::KG					! ����ˮ����ϵ��
+	REAL::KSS					! ����������ϵ��
+	REAL::KKG					! ����ˮ����ϵ��	
+	REAL::KKSS					! ����������ϵ��		
+    
 	REAL::AREA					! ��Ԫ���
 	REAL::UH(M)					! ����ε�λ��
 	REAL::DT					! ʱ�β���
@@ -40,17 +67,7 @@ SUBROUTINE XAJMX(   FILELEN    ,&
     REAL::KSSD
     REAL::KGD 
  	REAL::E(3) 
- 	REAL::WM(3)
-	REAL::KC					! ������������ϵ��
-	REAL::C						! �������ϵ��	
-	REAL::B						! ����ˮ��ˮ����ϵ��
- 	REAL::IMP1					! ��͸ˮ�������		
-	REAL::SM					! ����ˮ��ˮ����
-	REAL::EX					! ����ˮ��ˮ����ָ��
-	REAL::KG					! ����ˮ����ϵ��
-	REAL::KSS					! ����������ϵ��
-	REAL::KKG					! ����ˮ����ϵ��	
-	REAL::KKSS					! ����������ϵ��					
+ 	REAL::WM(3)	
 
 !���±�����ԭvb������δ�����ı���
 	INTEGER::I					! ������					//��ʱ����
@@ -115,18 +132,8 @@ SUBROUTINE XAJMX(   FILELEN    ,&
     KGD = 0.0 
     do i = 1,3
         E(I)=0.0
-        WM(I) =0.0
     END DO
-    KC   = 0.0	
-    C    = 0.0
-    B	 = 0.0	
-    IMP1 = 0.0	
-    SM	 = 0.0
-    EX	 = 0.0
-    KG	 = 0.0
-    KSS	 = 0.0
-    KKG	 = 0.0
-    KKSS = 0.0
+
     U        = 0.0
     CI       = 0.0
     CG       = 0.0
@@ -161,23 +168,6 @@ SUBROUTINE XAJMX(   FILELEN    ,&
 	! ��ֵ
 	ICHECK = 1
 
-	DO I = 1, 3
-
-		WM(I) = PAR(I)
-
-	END DO
-	
-	KC		= PAR(4)
-    C		= PAR(5)
-    B		= PAR(6)
-    IMP1	= PAR(7)
-    SM		= PAR(8)
-    EX		= PAR(9)
-    KG		= PAR(10)
-    KSS		= PAR(11)
-    KKG		= PAR(12)
-    KKSS	= PAR(13)
-
 	DO I = 1, N 
 
 		QR(I) = 0.0	
@@ -210,7 +200,7 @@ SUBROUTINE XAJMX(   FILELEN    ,&
 		END IF
 
         EP(I) = EP(I) * KC
-        WM0 = WM(1) + WM(2) + WM(3)
+        WM0 = WUM + W1 + WDM
         W0 = W(1) + W(2) + W(3)
         PE = P(I) - EP(I)
  
@@ -256,7 +246,7 @@ SUBROUTINE XAJMX(   FILELEN    ,&
         ELSE
 
             E(1) = W(1) + P(I)
-            E(2) = (EP(I) - E(1)) * W(2) / WM(2)
+            E(2) = (EP(I) - E(1)) * W(2) / W1
 
             IF (W(2) .LE.( C * WM(2))) THEN
 
@@ -282,15 +272,15 @@ SUBROUTINE XAJMX(   FILELEN    ,&
         W(2) = W(2) - E(2)
         W(3) = W(3) - E(3)
 
-        IF (W(1) .GT. WM(1)) THEN
+        IF (W(1) .GT. WUM) THEN
 
-            W(2) = W(1) - WM(1) + W(2)
-            W(1) = WM(1)
+            W(2) = W(1) - WUM + W(2)
+            W(1) = WUM
 
-            IF (W(2) .GT. WM(2)) THEN
+            IF (W(2) .GT. W1) THEN
 
-                W(3) = W(3) + W(2) - WM(2)
-                W(2) = WM(2)
+                W(3) = W(3) + W(2) - W1
+                W(2) = W1
 
             END IF
 
diff --git a/HttpRequests/fortranwebapi.http b/HttpRequests/fortranwebapi.http
index aa780ce..ecb004f 100644
--- a/HttpRequests/fortranwebapi.http
+++ b/HttpRequests/fortranwebapi.http
@@ -9,7 +9,19 @@ Content-Type: application/json
   "text": "{\"FuncName\":\"calculate_main\",\"ClassName\":\"\",\"Par\":[    {"Name":"FILELEN","DataType":"0","ArrayType":"0","IsOut":"2","Data":0},
     {"Name":"NODE","DataType":"0","ArrayType":"0","IsOut":"2","Data":0},
     {"Name":"M","DataType":"0","ArrayType":"0","IsOut":"2","Data":0},
-    {"Name":"PAR","DataType":"1","ArrayType":"1","IsOut":"2","Data":[]},
+    {"Name":"WUM","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"W1","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"WDM","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"KC","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"C","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"B","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"IMP1","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"SM","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"EX","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"KG","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"KSS","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"KKG","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
+    {"Name":"KKSS","DataType":"1","ArrayType":"0","IsOut":"2","Data":0},
     {"Name":"NAREA","DataType":"0","ArrayType":"0","IsOut":"2","Data":0},
     {"Name":"AREA","DataType":"1","ArrayType":"1","IsOut":"2","Data":[]},
     {"Name":"UH","DataType":"1","ArrayType":"1","IsOut":"2","Data":[]},
diff --git a/Services/FortranInteropService.cs b/Services/FortranInteropService.cs
index 2b2856c..fd2cc23 100644
--- a/Services/FortranInteropService.cs
+++ b/Services/FortranInteropService.cs
@@ -37,7 +37,19 @@ namespace FortranWebApi.Services
             ref int FILELEN,
             ref int NODE,
             ref int M,
-            float[] PAR,
+            ref float WUM,
+            ref float W1,
+            ref float WDM,
+            ref float KC,
+            ref float C,
+            ref float B,
+            ref float IMP1,
+            ref float SM,
+            ref float EX,
+            ref float KG,
+            ref float KSS,
+            ref float KKG,
+            ref float KKSS,
             ref int NAREA,
             float[] AREA,
             float[] UH,
@@ -85,7 +97,19 @@ namespace FortranWebApi.Services
                 int FILELEN = GetIntParameter(parameters, "FILELEN");
                 int NODE = GetIntParameter(parameters, "NODE");
                 int M = GetIntParameter(parameters, "M");
-                float[] PAR = GetFloatArrayParameter(parameters, "PAR");
+                float WUM = GetFloatParameter(parameters, "WUM");
+                float W1 = GetFloatParameter(parameters, "W1");
+                float WDM = GetFloatParameter(parameters, "WDM");
+                float KC = GetFloatParameter(parameters, "KC");
+                float C = GetFloatParameter(parameters, "C");
+                float B = GetFloatParameter(parameters, "B");
+                float IMP1 = GetFloatParameter(parameters, "IMP1");
+                float SM = GetFloatParameter(parameters, "SM");
+                float EX = GetFloatParameter(parameters, "EX");
+                float KG = GetFloatParameter(parameters, "KG");
+                float KSS = GetFloatParameter(parameters, "KSS");
+                float KKG = GetFloatParameter(parameters, "KKG");
+                float KKSS = GetFloatParameter(parameters, "KKSS");
                 int NAREA = GetIntParameter(parameters, "NAREA");
                 float[] AREA = GetFloatArrayParameter(parameters, "AREA");
                 float[] UH = GetFloatArrayParameter(parameters, "UH");
@@ -115,7 +139,19 @@ namespace FortranWebApi.Services
                     ref FILELEN,
                     ref NODE,
                     ref M,
-                    PAR,
+                    ref WUM,
+                    ref W1,
+                    ref WDM,
+                    ref KC,
+                    ref C,
+                    ref B,
+                    ref IMP1,
+                    ref SM,
+                    ref EX,
+                    ref KG,
+                    ref KSS,
+                    ref KKG,
+                    ref KKSS,
                     ref NAREA,
                     AREA,
                     UH,