Changeset 81

Timestamp:

01/17/13 11:15:04 (11 years ago)

Author:

jbrlod

Message:

bug fixes

Location:

trunk

Files:

• data_in/file_rest/GYRE_00000400_restart_CONTROL_T.nc (modified) (previous)
• data_in/file_rest/GYRE_00000400_restart_CONTROL_T_short.nc (modified) (previous)
• src/Makefile (modified) (1 diff)
• src/sinobad.d (modified) (3 diffs)
• src/sinobad.h (modified) (2 diffs)

trunk/src/Makefile

@@ -2 +2 @@
 #GENOPT= -E
 GENOPT=-DOPTIMORDER -E
-YAOPT= -p -n +g -x sinobad
+YAOPT= -p +O3 -x sinobad
 
 essai: essai.d ../object/ncutil.o

trunk/src/sinobad.d

@@ -19 +19 @@
 defval NY      22  
 defval NZ      31 
-defval NMAX    800 //    !  maximum of iterations for the SOR solver
+defval NMAX    800 //    !    maximum of iterations for the SOR solver
 defval TA      10 |__DATE__ | number of time steps
 defval TU       2 | start time step
@@ -60 +60 @@
 //#option O_VARINCR
 //#option    O_GRADTEST
-//#option   O_DBG_NANF
+option   O_DBG_NANF
 //#option   O_DBG_TING
 //option O_DUAL
@@ -812 +812 @@
 ctin     wa                     2       from    hdivn                   1  i    j    k    t
 //#---------->
-exec disp_ct_in
+//#exec disp_ct_in
 
 #ifdef OPTIMORDER

trunk/src/sinobad.h

@@ -1135 +1135 @@
   //xwriteout t suff ncfile 
   //Ecrit dans le fichier ncfile les variables u,v,t,s,ssh avec le suffixe suff au pas de temps t
-  if (argc!=4)
+  if (argc<4)
    { 
      printf("\n not enough arguments in writeout\n");
@@ -1142 +1142 @@
 
   int t;
+  int tbeg,tend;
   char suff[200];
   char ncfile[200];
   int ncfile_id;
-  t=atoi(argv[1]);
-  strcpy(suff,argv[2]);
-  strcpy(ncfile,argv[3]);
-  ncfile_id=Ouvre_nc_add(ncfile);
-  write_out_var(t,ncfile_id,suff);
-  nc_close(ncfile_id);
+  if (argc==4) {
+    t=atoi(argv[1]);
+    strcpy(suff,argv[2]);
+    strcpy(ncfile,argv[3]);
+    ncfile_id=Ouvre_nc_add(ncfile);
+    write_out_var(t,ncfile_id,suff);
+    nc_close(ncfile_id);
+  }
+  else {
+    tbeg=atoi(argv[1]);
+    tend=atoi(argv[2]);
+    t=atoi(argv[3]); //dt
+    //    strcpy(suff,argv[2]);
+    strcpy(ncfile,argv[5]);
+    ncfile_id=Ouvre_nc_add(ncfile);
+    for (int i=tbeg;i<=tend;i+=t) {
+      sprintf(suff,"%s_%d",argv[4],i);
+      write_out_var(i,ncfile_id,suff);
+    }
+    nc_close(ncfile_id);
+  }
+
 
 }