Changeset 69 for branches/branche-mb/src/sbcgyre_qsr_qns.h

Timestamp:

08/30/11 16:40:09 (13 years ago)

Author:

berrada

Message:

fusion tronc dans mb-branche

File:

• branches/branche-mb/src/sbcgyre_qsr_qns.h (modified) (1 diff)

branches/branche-mb/src/sbcgyre_qsr_qns.h

@@ -24 +24 @@
   else{
     //      ! current day (in hours) since january the 1st of the current year
-    double  ztime = double(Yt-TU) * rdt / (rmmss * rhhmm)  //       !  total incrementation (in hours)
+    /*    double  ztime = double(Yt-TU) * rdt / (rmmss * rhhmm)  //       !  total incrementation (in hours)
+          - (nyear  - 1) * rjjhh * raajj;  //           !  minus years since beginning of experiment (in hours)
+    */
+    double  ztime = kt * rdt / (rmmss * rhhmm)  //       !  total incrementation (in hours)
       - (nyear  - 1) * rjjhh * raajj;  //           !  minus years since beginning of experiment (in hours)
-    
     double  ztimemax1 = ((5.*30.)+21.)* 24.;//                     ! 21th june     at 24h in hours
     double  ztimemin1 = ztimemax1 + rjjhh * raajj / 2.;//            ! 21th december        in hours