Changeset 8

Timestamp:

03/10/11 16:51:28 (13 years ago)

Author:

jbrlod

Message:

def de la version de ref

Location:

trunk

Files:

• include/meshmask.h (modified) (6 diffs)
• include/ncutil.cpp (modified) (2 diffs)
• include/ncutil.h (modified) (1 diff)
• scripts (added)
• scripts/sinobad.i (added)
• src/sinobad (modified) (previous)
• src/sinobad.d (modified) (1 diff)
• src/sinobad.h (modified) (4 diffs)

trunk/include/meshmask.h

@@ -95 +95 @@
 int neuler=0; //restart file
 
+int nyear=1; // current year
+int nmonth=1; //current month of the year nyear
+int nday=1; //current day of the year nyear
+double ndastp=nyear*10000 + nmonth*100 + nday; //date at the end of the current (previous) run
+double adatrj=0; //date in days since the beginning of the run
+double kt=0; //ocean time step
+
+
 #   define        ze1ur(i,j)  e2u(i,j) / e1u(i,j)
 #   define        ze2vr(i,j)  e1v(i,j) / e2v(i,j)
@@ -208 +216 @@
   gdepw_0_id=Var_id(mesh_mask_file_id,"gdepw_0");
   zonclire(0, NZ, mesh_mask_file_id, gdepw_0_id,gdepw_0);
- 
+
+
   //gdept_0
   nc_close( mesh_mask_file_id);
@@ -372 +381 @@
       YS_gcx2(0,i,j,TU-1)=temp[(j)*(NX)+(i)];
     }
+  // ndastp
+  temp_id=Var_id(rest_file_id,"ndastp");
+  scalarlire(rest_file_id,temp_id,&ndastp);
+
+  //adatrj
+  temp_id=Var_id(rest_file_id,"adatrj");
+  scalarlire(rest_file_id,temp_id,&adatrj);
+
+  //kt
+temp_id=Var_id(rest_file_id,"kt");
+  scalarlire(rest_file_id,temp_id,&kt);
+
 }
 
@@ -412 +433 @@
 zncwrite(NZ,"nav_lev",ncid,dimids,vect);
 
+//time_counter
+ twrite(0,"time_counter",ncid,dimids[0],kt);
+
+
 //gcx
 for(int j=0;j<NY;j++)
@@ -440 +465 @@
  soncwrite(0,NY,NX,"sshn",ncid,dimids,vect);
  
+ //rdt
+ scalarwrite(ncid,"rdt",rdt);
+ 
+//rdttra1
+ scalarwrite(ncid,"rdttra1",rdt);
+
  //ub
  for(int k=0;k<NZ;k++)
@@ -535 +566 @@
      }
  voncwrite(0,NZ,NY,NX,"hdivn",ncid,dimids,vect);
+
+ //kt
+ scalarwrite(ncid,"kt",kt);
+
+ //ndastp
+ scalarwrite(ncid,"ndastp",ndastp);
+
+ //adatrk
+ scalarwrite(ncid,"adatrj",adatrj);
 
 

trunk/include/ncutil.cpp

@@ -51 +51 @@
 }
 
+void twrite(int t, char *var_name,int ncid,int tid,int var)
+{
+  //Ecrire un scalaire au temps t
+  //le parametre t commence de 0.
+  // ecrit la variable var_name au point (t)
+  int status;
+
+  int var_id;
+  static size_t start[] = {0}; //3D+t
+  static size_t count[] = {1}; //3D+t
+  count[0]= (size_t) t+1;
+  start[0]=t; //temps commence de 0;
+
+  //Define the netCDF variable
+  status=nc_redef(ncid);
+if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur change to def mode NetCDF ::voncwrite");
+    }
+ 
+ status=nc_def_var(ncid,var_name,NC_INT,1,&tid,&var_id);
+ 
+  if (status != NC_NOERR)
+    {
+      printf("variable %s:",var_name);
+      handle_error (status, "Erreur define NetCDF variable ::voncwrite");
+    }
+ nc_enddef(ncid);
+  status=nc_put_vara_int(ncid,var_id,start,count,&var);
+ if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur writing NetCDF variable ::voncwrite");
+    }
+}
+
+void twrite(int t, char *var_name,int ncid,int tid,float var)
+{
+  //Ecrire un scalaire au temps t
+  //le parametre t commence de 0.
+  // ecrit la variable var_name au point (t)
+  int status;
+
+  int var_id;
+  static size_t start[] = {0}; //3D+t
+  static size_t count[] = {1}; //3D+t
+  count[0]= (size_t) t+1;
+  start[0]=t; //temps commence de 0;
+
+  //Define the netCDF variable
+  status=nc_redef(ncid);
+if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur change to def mode NetCDF ::voncwrite");
+    }
+ 
+ status=nc_def_var(ncid,var_name,NC_FLOAT,1,&tid,&var_id);
+ 
+  if (status != NC_NOERR)
+    {
+      printf("variable %s:",var_name);
+      handle_error (status, "Erreur define NetCDF variable ::voncwrite");
+    }
+ nc_enddef(ncid);
+  status=nc_put_vara_float(ncid,var_id,start,count,&var);
+ if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur writing NetCDF variable ::voncwrite");
+    }
+}
+
+void twrite(int t, char *var_name,int ncid,int tid,double var)
+{
+  //Ecrire un scalaire au temps t
+  //le parametre t commence de 0.
+  // ecrit la variable var_name au point (t)
+  int status;
+
+  int var_id;
+  static size_t start[] = {0}; //3D+t
+  static size_t count[] = {1}; //3D+t
+  count[0]= (size_t) t+1;
+  start[0]=t; //temps commence de 0;
+
+  //Define the netCDF variable
+  status=nc_redef(ncid);
+if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur change to def mode NetCDF ::voncwrite");
+    }
+ 
+ status=nc_def_var(ncid,var_name,NC_DOUBLE,1,&tid,&var_id);
+ 
+  if (status != NC_NOERR)
+    {
+      printf("variable %s:",var_name);
+      handle_error (status, "Erreur define NetCDF variable ::voncwrite");
+    }
+ nc_enddef(ncid);
+  status=nc_put_vara_double(ncid,var_id,start,count,&var);
+ if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur writing NetCDF variable ::voncwrite");
+    }
+}
+
+
 void voncwrite(int t,int znbval,int ynbval, int xnbval, char const *var_name,int ncid,int dimids[], YREAL vect[])
 { //Ecrrire le volume 3D au temps t
@@ -432 +538 @@
 }
 
+void scalarlire (int ncid,int varid, int *var) {
+  int status;
+  status=nc_get_var_int (ncid,varid,var);
+  if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur lecture fichier NetCDF::scalarlire");
+    }
+}
+
+void scalarlire (int ncid,int varid, float *var) {
+  int status;
+  status=nc_get_var_float (ncid,varid,var);
+  if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur lecture fichier NetCDF::scalarlire");
+    }
+}
+
+void scalarlire (int ncid,int varid, double *var) {
+  int status;
+  status=nc_get_var_double (ncid,varid,var);
+  if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur lecture fichier NetCDF::scalarlire");
+    }
+}
+
+void scalarwrite (int ncid,char const *var_name,int var) {
+  int status;
+  int var_id;
+  status=nc_redef(ncid);
+  if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur change to def mode NetCDF ::scalarwrite");
+    }
+  
+  status=nc_def_var(ncid,var_name,NC_INT,0,NULL,&var_id);
+  
+  if (status != NC_NOERR)
+    {
+      printf("variable %s:",var_name);
+      handle_error (status, "Erreur define NetCDF variable ::scalarwrite");
+    }
+  nc_enddef(ncid);
+  status=nc_put_var_int(ncid,var_id,&var);
+  if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur writing NetCDF variable ::scalarwrite");
+    }
+}
+void scalarwrite (int ncid,char const *var_name,float var) {
+  int status;
+  int var_id;
+  status=nc_redef(ncid);
+  if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur change to def mode NetCDF ::scalarwrite");
+    }
+  
+  status=nc_def_var(ncid,var_name,NC_FLOAT,0,NULL,&var_id);
+  
+  if (status != NC_NOERR)
+    {
+      printf("variable %s:",var_name);
+      handle_error (status, "Erreur define NetCDF variable ::scalarwrite");
+    }
+  nc_enddef(ncid);
+  status=nc_put_var_float(ncid,var_id,&var);
+  if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur writing NetCDF variable ::scalarwrite");
+    }
+}
+void scalarwrite (int ncid,char const *var_name,double var) {
+  int status;
+  int var_id;
+  status=nc_redef(ncid);
+  if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur change to def mode NetCDF ::scalarwrite");
+    }
+  
+  status=nc_def_var(ncid,var_name,NC_DOUBLE,0,NULL,&var_id);
+  
+  if (status != NC_NOERR)
+    {
+      printf("variable %s:",var_name);
+      handle_error (status, "Erreur define NetCDF variable ::scalarwrite");
+    }
+  nc_enddef(ncid);
+  status=nc_put_var_double(ncid,var_id,&var);
+  if (status != NC_NOERR)
+    {
+      handle_error (status, "Erreur writing NetCDF variable ::scalarwrite");
+    }
+}
+
 void sncwrite(int ynbval, int xnbval, char const *var_name,int ncid,int dimids[], YREAL vect[])
 { //Ecrrire le volume 2D

trunk/include/ncutil.h

@@ -64 +64 @@
 void znclire(int znbval, int ncid, int varid, double vect[]);
 
+void scalarlire (int ncid,int varid, int *var);
+void scalarlire (int ncid,int varid, float *var);
+void scalarlire (int ncid,int varid, double *var);
+
+void scalarwrite (int ncid,char const *var_name,int var);
+void scalarwrite (int ncid,char const *var_name,float var);
+void scalarwrite (int ncid,char const *var_name,double var);
+
 void zoncwrite(int t,int znbval,char const *var_name,int ncid,int dimids[], YREAL vect[]);
 
 void zncwrite(int znbval,char const *var_name,int ncid,int dimids[], YREAL vect[]);
 void sncwrite(int ynbval, int xnbval, char const *var_name,int ncid,int dimids[], YREAL vect[]);
+
+void twrite(int t, char *var_name,int ncid,int tid,int var);
+void twrite(int t, char *var_name,int ncid,int tid,float var);
+void twrite(int t, char *var_name,int ncid,int tid,double var);
+
 #endif
 

trunk/src/sinobad.d

@@ -790 +790 @@
 insert_fct  arg true_target_in_tab
 insert_fct  arg xrst_save
+insert_fct  arg xchangesavemode
+
 #insert_fct  arg load_shape_func
 #insert_fct  arg load_stdev_pca

trunk/src/sinobad.h

@@ -62 +62 @@
 //latitude for the Coriolis or Beta parameter
 
+//mode de sauvegarde (==0 3D, ==1 2D surface)
+short savemode=0;
+
 
 int n_zdfexp=3;
@@ -70 +73 @@
   nday_year : current day of the year nyea
   ndastp    : = nyear*10000 + nmonth*100 + nday*/
-int nyear=1; // a revoir
-
 
 void cal_ff();
@@ -369 +370 @@
     xistate_rest_file(rest_file_id);
     nc_close( rest_file_id);
+    //printf("kt=%f, ndastp=%f, adatrj=%f",kt,ndastp,adatrj);
+
     for(int i=0;i<NX;i++)
       for(int j=0;j<NY;j++){
@@ -454 +457 @@
   }
 }
+
+void xchangesavemode(int argc, char *argv[]){
+  short newmode=atoi(argv[1]);
+  savemode=newmode;
+
+}
+
 //_____________________________________________________________________________
 void xistate_yao_file(char * pth_file_yao){ // a faire