Changeset 122

Timestamp:

06/23/14 17:55:10 (10 years ago)

Author:

jbrlod

Message:

correct a bug in spaceorder / add save_output_rfloat

Location:

altifloat/src

Files:

• floater.h (modified) (3 diffs)
• floater_delta.d (modified) (6 diffs)

altifloat/src/floater.h

@@ -69 +69 @@
       pjobs[i][j]=0;
       piret[i][j]=0;
-      pjret[i][j]=0;
+      pjret[i][j]=0; 
       pmask[i][j]=0;
       }
@@ -248 +248 @@
 
 void save_uv(int iti, int itn) {
-  /* save u,v fields in umod,vmod */
+  /* save u,v fields in umod,vmod 
+   and save piret,pjret*/
   int j,k,it;
-  for (it=iti;it<itn;it++)
+  int Yifloat=0;
+  for (it=iti;it<itn;it++) {
+    Yifloat=0;
     for (j=0;j<nlon;j++)
       for (k=0;k<nlat;k++) {
@@ -260 +263 @@
 #endif
       }
-}
+    for (j=0;j<jpnfl;j++) 
+      if (pmask[iti][j]==1 && is_activ(j,iti)>0 && it>iti) {
+        pjret[it][j]=YS1_r_float(Yifloat,it-iti);
+        piret[it][j]=YS2_r_float(Yifloat,it-iti);
+        Yifloat++;
+      }
+  }
+}
+
+void save_output_rfloat (int argc, char *argv[]) {
+  FILE *fid;
+  fid=fopen(argv[1],"w");
+  if (fid==NULL) {
+    printf("\nfailed to open %s",argv[1]);
+    exit(3);
+  }
+  int j,it;
+  for (j=0;j<jpnfl;j++)
+    for (it=0;it<jptfl;it++)
+      
+      fprintf(fid,"%d %d %f %f\n",it,j,piret[it][j],pjret[it][j]);
+        
+                                             
+  fclose(fid);
+
+}
+
 void save_output_uv (int argc, char *argv[]) {
   FILE *fid;

altifloat/src/floater_delta.d

@@ -7 +7 @@
 
 defval jptfl 22 //Nombre total de pas de temps
-defval jpnfl 1 //nombre total de flotteurs
+defval jpnfl 2 //nombre total de flotteurs
 
 
@@ -179 +179 @@
 #endif
 
+order modinspace S_eulerlocate
+        order YA1 YA2 YA3
+                locate
+        forder
+forder
+
 order modinspace S_float
         order YA1
@@ -185 +191 @@
 forder
 
-order modinspace S_eulerlocate
-        order YA1 YA2 YA3
-                locate
-        forder
-forder
+
 
 order spaceintraj T_float
@@ -196 +198 @@
  
 //deltas
+
+order modinspace S_eulerlocate_d
+        order YA1 YA2 YA3
+                locate_d
+        forder
+forder
+
 order modinspace S_float_d
         order YA1
@@ -202 +211 @@
 forder
 
-order modinspace S_eulerlocate_d
-        order YA1 YA2 YA3
-                locate_d
-        forder
-forder
 
 #ifdef FILTER
@@ -229 +233 @@
 insert_fct multirun
 insert_fct arg save_output_uv
+insert_fct arg save_output_rfloat