Changeset 71

Timestamp:

09/28/11 16:47:04 (13 years ago)

Author:

jbrlod

Message:

can restart from any restart (including kt>0)

Location:

trunk

Files:

• include/meshmask.h (modified) (1 diff)
• include/namelist.h (modified) (1 diff)
• scripts/sinobad.i (modified) (1 diff)
• scripts/sinobad_forward_tourbillon.i (added)
• src/.TERM_xterm (deleted)
• src/Makefile (modified) (1 diff)
• src/cost.dat (deleted)
• src/sinobad.d (modified) (4 diffs)
• src/sinobad.h (modified) (10 diffs)

trunk/include/meshmask.h

@@ -391 +391 @@
   //kt
 temp_id=Var_id(rest_file_id,"kt");
-  scalarlire(rest_file_id,temp_id,&kt);
+  scalarlire(rest_file_id,temp_id,&nit000);
 
 }

trunk/include/namelist.h

@@ -25 +25 @@
 //                           !                  = 1 use ndate0 in namelist (not the value in the restart file)
 //                           !                  = 2 calendar parameters read in the restart file
-//   nit000      =       1   !  first time step
+double   nit000      =        0 ;// !  first time step
 //   nitend      =    10 !4320   !  last  time step
 int ndate0      =  010101;//   !  initial calendar date yymmdd (used if nrstdt=1)

trunk/scripts/sinobad.i

@@ -25 +25 @@
 ##OBSERVATION
 xwriteout 50 obs_48 ../data_out/exp_T.nc
+
+xrst_save ../data_in/file_rest/GYRE_00000420_restart_forwardYAO.nc
 
 goto FINRUN

trunk/src/Makefile

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

trunk/src/sinobad.d

@@ -1 +1 @@
 //defval K_NEU
 //#define FZIMP
-#define FILTER
-#define FILZNOL
+//#define FILTER
+//#define FILZNOL
 //#define FILLNOZ
 //#define SOLSORYAO
@@ -19 +19 @@
 defval NZ      31 
 defval NMAX    800 //    !  maximum of iterations for the SOR solver
-defval TA      50 |__DATE__ | number of time steps
+defval TA      101 |__DATE__ | number of time steps
 defval TU       2 | start time step
 #ifdef FILTER
@@ -54 +54 @@
 //#OPTION ----------------------------------------------OPTION
 
-option    O_M1QN3 | M2QN1 
+//#option    O_M1QN3 | M2QN1 
+option O_M1QN3
 //#option O_VARINCR
-option    O_GRADTEST
-option   O_DBG_NANF
+//#option    O_GRADTEST
+//#option   O_DBG_NANF
 //#option   O_DBG_TING
 option  O_EXTOBJ "../object/ncutil.o"
@@ -1219 +1220 @@
 insert_fct arg xinitnc
 insert_fct arg init_euler
+insert_fct arg init_kt
 //#insert_fct  arg load_shape_func
 //#insert_fct  arg load_stdev_pca

trunk/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;
@@ -73 +73 @@
 //latitude for the Coriolis or Beta parameter
 
-//mode de sauvegarde (==0 3D, ==1 2D surface)
+//mode de sauvegarde (==0 3D, ==1 2D surface ==2 un seul point)
 short savemode=0;
-
+short isave=23;
+short jsave=16;
+short ksave=0;
 
 int n_zdfexp=3;
@@ -166 +168 @@
   xdisplay();
   xtraqsr_init();
-  ktinit=0; //A mettre dans la namelist ????
+  YDispTime=1;
 }
 //____________________________________________________________________________
@@ -180 +182 @@
   fprintf(p,"%23.16e\n",YTotalCost);
   fclose(p);
-  Ytold=Yt;
-  kt=ktinit;
+  //kt=nit000+(Yt-TU);
 }
 //_____________________________________________________________________________
@@ -199 +200 @@
 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;
-    else
-      r2dt=2.*rdt;  
+  kt=nit000 + (Yt-TU);
+  if(YDispTime) printf(" >>> current forward time : kt=%lf \n",kt);
+  if(Yt==TU+1 && neuler==0)
+    r2dt=rdt;
+  else
+    r2dt=2.*rdt;  
   }
 //_____________________________________________________________________________
 void forward_after (int ctrp)
-{                       // permet d'intervenir si besoin aprÚs le forward
-  //printf("neuler=%d\n",neuler);
+{               
+        // permet d'intervenir si besoin aprÚs le forward
+ //printf("neuler=%d\n",neuler);
 }
 //_____________________________________________________________________________
@@ -241 +241 @@
                         // =YIO_OUTOOBS    => appel via outoobs
 
-   if(indic==YIO_SAVESTATE && !strcmp(nmmod,"tb") && savemode){
+   if(indic==YIO_SAVESTATE && !strcmp(nmmod,"tb") && savemode==1){
     if(kaxe==0 )
       return(1);
@@ -247 +247 @@
       return(0);
       }
+   if(indic==YIO_SAVESTATE && !strcmp(nmmod,"tb") && savemode==2){
+     if(iaxe==isave && jaxe==jsave && kaxe==ksave) 
+       return(1);
+     else
+       return(0);
+   }
+
     
   /*  if(indic==YIO_OUTOOBS){
@@ -643 +650 @@
   short newmode=atoi(argv[1]);
   savemode=newmode;
+  if (newmode==2) {
+    isave=atoi(argv[2]);
+    jsave=atoi(argv[3]);
+    ksave=atoi(argv[4]);
+    printf("\n savemode : 1 point (Yi=%d,Yj=%d,Yk=%d)\n",isave,jsave,ksave);
+  }
 
 }
@@ -1081 +1094 @@
       write_rst_global_att(rest_file_id); //Ecrit les global attributes
       define_dim(rest_file_id,dimid); //Définit les dimensions
-      write_rst_var(TU,rest_file_id,dimid); //Ecrit les variables
+      printf("\n Save restart at kt=%f (Yt=%d)\n",kt,Yt);      
+      write_rst_var(kt-nit000+TU,rest_file_id,dimid); //Ecrit les variables
       nc_close( rest_file_id); //ferme le fichier
     }
@@ -1169 +1183 @@
     }
 }
+
+void init_kt(int argc, char *argv[]){
+  if (argc!=2)
+    {
+      printf("\nwrong number of argument in init_kt : specify a positive number\n");
+      exit(1);
+    }
+  else
+    {
+      double t0;
+      t0=atof(argv[1]);
+      if(t0<0)
+        {
+          printf("\nwrong argument in init_kt : specify a postiive number\n");
+          exit(1);
+        }
+      nit000=t0;
+    }
+}
+
+/* Plus tard pour tester l'erreur modÚle.
+void genere_obs(int argc, char *argv[]){
+  //genere_obs Module increment t0 dt tend i j k
+  if (argc!=9)
+    {
+      printf("\n wrong number of argument in genere_obs \n");
+      exit(1);
+    }
+  else
+    {
+
+    }
+
+
+
+}
+*/