Changes between Version 31 and Version 32 of DevelopmentActivities/Bugs

Timestamp:

2016-03-16T16:54:50+01:00 (8 years ago)

Author:

ajornet

Comment:

--

DevelopmentActivities/Bugs

@@ -114 +114 @@
 
 Attention: the use of WHERE statement with min_stomate is a bad practice which leads to potential bugs. What if the value is negative? In this case it would be ignored.
+
+= Merge Issues =
+
+== Revision 2944 ==
+
+changeset:2944
+
+There is a conflict at lpj_gap. The conditions in the trunk are slightly different from MICT. The code from MICT is already updated with log's change. Is there any problem?
+
+{{{
+          IF ( ok_dgvm .AND. (tmin_crit(j) .NE. undef) ) THEN
+             ! frost-sensitive PFTs
+             WHERE ( t2m_min_daily(:) .LT. tmin_crit(j) )
+                mortality(:,j) = MIN(un,(coldness_mort*(tmin_crit(j)-t2m_min_daily(:))+mortality(:,j) ) )
+             ENDWHERE
+          ENDIF
+
+          IF ( ok_dgvm .AND. leaf_tab(j)==1 .AND. pheno_type(j)==2) THEN
+
+             ENDWHERE
+          ENDIF
+
+          IF ( ok_dgvm .AND. leaf_tab(j)==1 .AND. pheno_type(j)==2) THEN
+<<<<<<< .working
+             ! spring frost
+             WHERE ( Tmin_spring(:,j) .LT. frost_damage_limit )
+                mortality(:,j) = MIN(un,(0.01*(frost_damage_limit-Tmin_spring(:,j))*Tmin_spring_time(:,j)/spring_days_max+mortality(:,j) ) )
+             ENDWHERE
+          ENDIF
+=======
+             ! Treat the spring frost for broadleaf and summergreen vegetations
+             ! leaf_tab=broadleaf and pheno_typ=summergreen
+             DO i=1,npts
+                IF ( (Tmin_spring_time(i,j)>0) .AND. (Tmin_spring_time(i,j)<spring_days_max+1) ) THEN
+                   IF ( t2m_min_daily(i) .LT. frost_damage_limit ) THEN
+                      mortality(i,j) = MIN(un,(0.01*(frost_damage_limit-t2m_min_daily(i))* &
+                           Tmin_spring_time(i,j)/spring_days_max+mortality(i,j) ) )
+                   END IF
+                END IF
+             END DO
+          END IF
+
+>>>>>>> .merge-right.r2944
+
+          !! 1.4 Update biomass and litter pools 
+          !    Update biomass and litter pool after dying and transfer recently died biomass to litter
+}}}