improving standalone rain test case

standalone/make_rain_input.m

@@ -1,5 +1,17 @@
-function make_rain_input(n)
-% create moisture_input.txt for a given number of time steps
-% should give 1.723 fotr 14-hour wetting time lag
-mm=[14*[0:n]'/n,ones(n+1,1)*[300,1e5,0.01],1e3*[0:n]'/n];
-save('moisture_input.txt','mm','-ascii')
+function make_rain_input(n,mmph,hours)
+% create moisture_input.txt for moisture_test.exe 
+% usage: make_rain_input(n,mmph)
+% input: 
+%    n        number of time steps
+%    mmph     rain intensity mm/h
+%    hours    length of simulation in hours
+% example
+% make_rain_input(n,100,14) should give 1.723 for 14-hour wetting time lag
+%
+% note: the last line in the output from moisture_test.exe
+%       should not depend on n
+
+mm=[hours*[0:n]'/n,ones(n+1,1)*[300,1e5,0.01],mmph*hours*[0:n]'/n];
+save('moisture_input.txt','mm','-ascii')
+
+end

standalone/moisture_input.txt

@@ -1,8 +1,8 @@
    0.0000000e+00   3.0000000e+02   1.0000000e+05   1.0000000e-02   0.0000000e+00
-   2.0000000e+00   3.0000000e+02   1.0000000e+05   1.0000000e-02   1.4285714e+02
-   4.0000000e+00   3.0000000e+02   1.0000000e+05   1.0000000e-02   2.8571429e+02
-   6.0000000e+00   3.0000000e+02   1.0000000e+05   1.0000000e-02   4.2857143e+02
-   8.0000000e+00   3.0000000e+02   1.0000000e+05   1.0000000e-02   5.7142857e+02
-   1.0000000e+01   3.0000000e+02   1.0000000e+05   1.0000000e-02   7.1428571e+02
-   1.2000000e+01   3.0000000e+02   1.0000000e+05   1.0000000e-02   8.5714286e+02
-   1.4000000e+01   3.0000000e+02   1.0000000e+05   1.0000000e-02   1.0000000e+03
+   2.0000000e+00   3.0000000e+02   1.0000000e+05   1.0000000e-02   2.0000000e+02
+   4.0000000e+00   3.0000000e+02   1.0000000e+05   1.0000000e-02   4.0000000e+02
+   6.0000000e+00   3.0000000e+02   1.0000000e+05   1.0000000e-02   6.0000000e+02
+   8.0000000e+00   3.0000000e+02   1.0000000e+05   1.0000000e-02   8.0000000e+02
+   1.0000000e+01   3.0000000e+02   1.0000000e+05   1.0000000e-02   1.0000000e+03
+   1.2000000e+01   3.0000000e+02   1.0000000e+05   1.0000000e-02   1.2000000e+03
+   1.4000000e+01   3.0000000e+02   1.0000000e+05   1.0000000e-02   1.4000000e+03

standalone/moisture_test_main.F

@@ -40,7 +40,7 @@ program moisture_main
 ! write header
 if(moisture_classes>5)call crash('at most 5 moisture classes allowed')
 do i=6,7
-    write(i,1)'Step','Time', 'T','P','Q','RAIN',('EQUI',k,'LAG',k,'FMC',k,k=1,moisture_classes)
+    write(i,1)'Step','Time', 'T','P','Q','RAIN',('EQUI',k,'TLAG',k,'FMC',k,k=1,moisture_classes)
     write(i,2)' ','hours','K','Pa','kg/kg','mm',('kg/kg','hours','kg/kg',k=1,moisture_classes)
 enddo
 1 format(a4,a8,  a6,  a9,  a6  ,a8, 15(a5,i1))