Changes between Version 35 and Version 36 of DevelopmentActivities/MergeHydro

Timestamp:

2012-07-13T11:22:02+02:00 (12 years ago)

Author:

dsolyga

Comment:

--

DevelopmentActivities/MergeHydro

@@ -159 +159 @@
 This section lists the modifications needed to merge the DOC/Hydro branch into the trunk :
 
- * hydrol : Move flag ok_throughfall_by_pft to pft_parameters. The pft parameter throughfall_by_pft is initiliazed and read in pft_parameters.f90. Correct memory allocation and initialization for parameter throughfall_by_pft :
+ * hydrol : Move flag ok_throughfall_by_pft to pft_parameters :
+{{{
+     IF ( active_flags%hydrol_cwrr ) THEN
+         
+         !! 2.1 Read the flag ok_throughfall_by_pft to know if 
+         !!      we have to use the parameter throughfall_by_pft
+
+         !Config Key   = OK_THROUGHFALL_PFT
+         !Config Desc  = Activate use of PERCENT_THROUGHFALL_PFT
+         !Config If    = HYDROL_CWRR
+         !Config Def   = FALSE
+         !Config Help  = If NOT OFF_LINE_MODE it is always TRUE (coupled with a GCM)
+         !Config Units = [FLAG]
+         IF ( .NOT. OFF_LINE_MODE ) ok_throughfall_by_pft = .TRUE.
+         CALL getin_p('OK_THROUGHFALL_PFT',ok_throughfall_by_pft)   
+
+      END IF
+
+}}}
+
+
+The pft parameter throughfall_by_pft is initiliazed and read in pft_parameters.f90. Correct memory allocation and initialization for parameter throughfall_by_pft :
+
+
+{{{
+      IF ( .NOT.(active_flags%hydrol_cwrr) .OR. (active_flags%hydrol_cwrr .AND. ok_throughfall_by_pft) ) THEN
+         ALLOCATE(throughfall_by_pft(nvm),stat=ier)
+         l_error = l_error .OR. (ier /= 0)
+         IF (l_error) THEN
+            WRITE(numout,*) ' Memory allocation error for throughfall_by_pft. We stop. We need nvm words = ',nvm
+            STOP 'pft_parameters_alloc'
+         END IF
+      END IF
+}}}
+
+
 
 {{{
@@ -187 +222 @@
     END IF
 }}}
- * routing : the following lines have been adapted for the externalization :
+ * routing : Add documentation. the following lines have been adapted for the externalization :
 
 
@@ -199 +234 @@
 
 }}}
- THE corresponding code now is :
+ The corresponding code now is :
    
  {{{