Changeset 69

Timestamp:

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

Author:

berrada

Message:

fusion tronc dans mb-branche

Location:

branches/branche-mb/src

Files:

• Makefile (modified) (2 diffs)
• cost.dat (modified) (1 diff)
• sbcgyre_emp1.h (modified) (1 diff)
• sbcgyre_qsr_qns.h (modified) (1 diff)
• sbcgyre_utau_vtau.h (modified) (1 diff)
• sinobad.d (modified) (4 diffs)
• sinobad.h (modified) (6 diffs)

branches/branche-mb/src/Makefile

@@ -2 +2 @@
 #GENOPT= -E
 GENOPT=-DOPTIMORDER -E
-YAOPT=  -p +O3 -x sinobad
+YAOPT=  -p  -x sinobad
 
-essai: essai.d
+essai: essai.d ../object/ncutil.o
         ${YAODIR}/etc/YaoI  $(YAOPT) essai.d
 
@@ -14 +14 @@
         cp -f sinobad.d essai.c
 
+../object/ncutil.o:
+         cd ../include && $(MAKE)
+
 clean:
-        rm -f essai.c
+        rm -f essai.c*
+
+rmproper: clean
+        rm -f ../object/ncutil.o

branches/branche-mb/src/cost.dat

@@ -3 +3 @@
  0.0000000000000000e+00
  2.1474823164582097e+02
- 1.2274234090104164e+01
- 2.3881198434552111e+01
- 8.8771059162513382e+00
- 5.5557975737505458e+00
- 3.4803779742760317e+00
- 1.7128978455386892e+00
- 1.1973455752757605e+00
- 9.8335187344394392e-01
- 7.6117334075192200e-01
- 5.9846985043808543e-01
- 6.7366624706570466e-01
- 5.5874401856066103e-01
- 7.3595639204467600e-01
- 5.0953722678532765e-01
- 1.1965283691171660e+00
- 6.5986339544255534e-01
- 6.6013045954860117e-01
- 6.5392286280927792e-01
- 5.6394373996837344e-01
- 5.7610237016601717e-01
- 5.8032116526810040e-01
- 5.8309360765246787e-01
- 5.8519910883568982e-01
- 5.8664512715255190e-01
- 5.8761359807265934e-01
- 5.8831541023256795e-01
- 5.8880781610867361e-01
- 5.8915693207370023e-01
- 5.0893021741293576e-01
- 5.0885469878063883e-01
- 5.8920763747258753e-01
- 5.0875296736771736e-01
- 5.0874187732734499e-01
- 5.8921509431560293e-01
- 5.8922030000369108e-01
- 5.8922395197080846e-01
- 5.8922651344473387e-01

branches/branche-mb/src/sbcgyre_emp1.h

@@ -17 +17 @@
   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

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

branches/branche-mb/src/sbcgyre_utau_vtau.h

@@ -19 +19 @@
     //      !accumulates days of previous months of this year
     //      ! day (in hours) since january the 1st
-    double  ztime = float(Yt-TU)*rdt/(rmmss*rhhmm)//  ! incrementation in hour
+    /*    double  ztime = float(Yt-TU)*rdt/(rmmss*rhhmm)//  ! incrementation in hour
+          - (nyear - 1) * rjjhh * raajj;//         !  - nber of hours the precedent years */
+    double  ztime =  kt*rdt/(rmmss*rhhmm)//  ! incrementation in hour
       - (nyear - 1) * rjjhh * raajj;//         !  - nber of hours the precedent years
     double  ztimemax = ((5.*30.)+21.)* 24.;//               ! 21th june     in hours

branches/branche-mb/src/sinobad.d

@@ -1 +1 @@
 //defval K_NEU
-#define FZIMP
+//#define FZIMP
 #define FILTER
 #define FILZNOL
@@ -30 +30 @@
 #endif
 //#exec disp_valdef
-#ifdef FZIMP
+#ifdef FZIMP //Filtre Z implicit
 defval K_FZIMP
 #endif
-#ifdef FILTER
+#ifdef FILTER //Filtre
 defval K_FILTER
 #endif
-#ifdef FILZNOL
+#ifdef FILZNOL //uniquement Filtre Z
 defval K_FILZNOL
 #endif
-#ifdef FILLNOZ
+#ifdef FILLNOZ //uniquement Filtre L
 defval K_FILLNOZ
 #endif
@@ -61 +61 @@
 option  O_EXTOBJ "../object/ncutil.o"
 option O_REAL double
-option o_parallel 16
+option o_parallel
 
 //#TRAJECTOIRES (DIM) -----------------------------------TRAJ
@@ -1218 +1218 @@
 insert_fct arg xwritegrad
 insert_fct arg xinitnc
+insert_fct arg init_euler
 //#insert_fct  arg load_shape_func
 //#insert_fct  arg load_stdev_pca

branches/branche-mb/src/sinobad.h

@@ -60 +60 @@
 int nksr;
 void xtraqsr_init();// init of solar radiation penetration
-
+double Ytold; //pour voir se pas de temps
+double ktinit; //premier pas ocean
 #   define  rdttra( k ) rdt
 double r2dt;
@@ -165 +166 @@
   xdisplay();
   xtraqsr_init();
+  ktinit=0; //A mettre dans la namelist ????
 }
 //____________________________________________________________________________
@@ -178 +180 @@
   fprintf(p,"%23.16e\n",YTotalCost);
   fclose(p);
+  Ytold=Yt;
+  kt=ktinit;
 }
 //_____________________________________________________________________________
@@ -195 +199 @@
 void forward_before (int ctrp)
 {       // permet d'intervenir si besoin avant le forward
+ 
+
+  kt=ktinit + (Yt-TU);
+  printf("kt=%lf\n",kt);
     if(Yt==TU+1 && neuler==0)
       r2dt=rdt;
@@ -203 +211 @@
 void forward_after (int ctrp)
 {                       // permet d'intervenir si besoin aprÚs le forward
+  //printf("neuler=%d\n",neuler);
 }
 //_____________________________________________________________________________
@@ -1141 +1150 @@
   
 }
+
+void init_euler(int argc, char *argv[]){
+  if (argc!=2)
+    {
+      printf("\nwrong number of argument in init_euler : specify 0 or 1\n");
+      exit(1);
+    }
+  else
+    {
+      int n;
+      n=atoi(argv[1]);
+      if(n!=0 && n!=1)
+        {
+          printf("\nwrong argument in init_euler : specify 0 or 1 in command init_euler\n");
+          exit(1);
+        }
+      neuler=n;
+    }
+}