Changes between Version 39 and Version 40 of DevelopmentActivities/MergeHydro/Martial_notes_on_merge

Timestamp:

2011-12-02T16:31:01+01:00 (12 years ago)

Author:

mmaipsl

Comment:

--

DevelopmentActivities/MergeHydro/Martial_notes_on_merge

@@ -136 +136 @@
 
        DO ji=1,kjpindex
-          IF ( ABS( tot_corr_veg_soil(ji) - (1 - vegtot(ji)) ) .GT. EPS1 ) THEN
-             WRITE(numout,*) 'corr_veg_soil SPLIT FALSE:ji=',ji,tot_corr_veg_soil(ji),(1 - vegtot(ji))
-             WRITE(numout,*) 'err',ABS( tot_corr_veg_soil(ji) - (1 - vegtot(ji)) )
+          IF ( ABS( tot_corr_veg_soil(ji) - 2 ) .GT. EPS1 ) THEN
+             WRITE(numout,*) 'corr_veg_soil SPLIT FALSE:ji=',ji,tot_corr_veg_soil(ji)
+             WRITE(numout,*) 'err',ABS( tot_corr_veg_soil(ji) - 2 )
              WRITE(numout,*) 'vegtot',vegtot(ji)
              DO jv=1,nvm
@@ -167 +167 @@
 \begin{array}{lcl}
 \displaystyle \sum_{jv=1,nvm} \sum_{jst=1,nstm}\frac {corr\_veg\_soil(jv,jst)}{vegtot \times veget\_max(jv)} &=& \\
-\displaystyle \sum_{jv=1,nvm} \sum_{jst=1,nstm} cvs\_over\_veg(jv,jst)  &=& 1 - vegtot \\
-&=& frac\_nobio
+\displaystyle \sum_{jv=1,nvm} \sum_{jst=1,nstm} cvs\_over\_veg(jv,jst)  &=& 2
 \end{array}
 \]
@@ -178 +177 @@
 \[
 \begin{array}{lcl}
-\displaystyle \sum_{jv=1,nvm} \sum_{jst=1,nstm}\frac {corr\_veg\_soil(jv,jst)}{veget\_max(jv)} &=& vegtot\times (1 - vegtot) = vegtot \times frac\_nobio 
+\displaystyle \sum_{jv=1,nvm} \sum_{jst=1,nstm}\frac {corr\_veg\_soil(jv,jst)}{veget\_max(jv)} &=& vegtot\times (1 - vegtot) = 2 \times vegtot 
 \end{array}
 \]