source: IO_handling/trunk/ppio/modeltime.patch @ 288

libcdms/include/cdunifpp/cdunifpp.h

@@ -117 +117 @@
 typedef enum pp_filetype PPfiletype;
 typedef enum pp_axistype PPaxistype;
 typedef enum pp_lev_val_type PPlevvaltype;
+typedef enum pp_calendartype PPcalendartype;
+
+enum pp_calendartype {
+  gregorian, 
+  cal360day,
+  model
+};
 
 enum pp_filetype {
   pp_type,
@@ -586 +593 @@
 PPdata *pp_taxis_to_values(const PPtaxis *, PPlist *);
 PPdata *pp_taxis_to_boundary_values(const PPtaxis *, PPlist *);
 int pp_is_time_mean(Fint);
-int pp_is_360day_calendar(Fint);
 Freal pp_time_diff(Fint, const PPdate *, const PPdate *);
+PPcalendartype pp_calendar_type(Fint);
 long long pp_gregorian_to_secs(const PPdate *);
 char *pp_t_units(const PPtaxis *, PPlist *);
 

libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c

@@ -211 +211 @@
   return (ib == 2) || (ib == 3);
 }
 
-int pp_is_360day_calendar(Fint LBTIM) {
-  int ic;
-  ic=LBTIM % 10;
-  return (ic == 2);
-}
-
 
 /* float_time returns time in days since origin time */
 
@@ -226 +220 @@
 
   const Freal sec_to_day = 1. / 86400.;
 
-  if (pp_is_360day_calendar(LBTIM)) {    
-
+  switch(pp_calendar_type(LBTIM)) {
+  case gregorian:
+    return (pp_gregorian_to_secs(date) - pp_gregorian_to_secs(orig_date)) * sec_to_day;
+    break; /* notreached */
+  case cal360day:
     secs =
       date->second - orig_date->second + 
       60 * (date->minute - orig_date->minute + 
@@ -237 +234 @@
                               12 * (long long) (date->year - orig_date->year) ))));
 
     return secs * sec_to_day;
+    break; /* notreached */
+  case model:
+    secs =
+      date->second - orig_date->second + 
+      60 * (date->minute - orig_date->minute + 
+            60 * (date->hour - orig_date->hour + 
+                  24 * (long long) (date->day - orig_date->day)));
+
+    return secs * sec_to_day;
+    break;
   }
+}
 
-  else {
+PPcalendartype pp_calendar_type(Fint type){
 
-    return (pp_gregorian_to_secs(date) - pp_gregorian_to_secs(orig_date)) * sec_to_day;
+  switch(type%10) {
+
+  case 0:
+    /* fallthrough */
+  case 3:
+    return model;
+    break; /* notreached */
+  case 1:
+    return gregorian;
+    break; /* notreached */
+  case 2:
+    return cal360day;
+    break; /* notreached */
+  default: pp_switch_bug();
+    
   }
 }
 
+
 long long pp_gregorian_to_secs(const PPdate *date)
 {
     /* FIXME: uses builtin time functions; these have a range 1902 - 2038 (approx).

libcdms/src/cdunif/cdunifpp/cdunifpp_error.c

@@ -11 +11 @@
 
 int pp_switch_bug()
 {
-  pp_error("no match in switch statement; may indicate coding bug in CDUNIFPP");
+  pp_error("no match in switch statement; may indicate coding bug in CDUNIFPP or unexpected header value");
   return 0;
 }
 

libcdms/src/cdunif/cdunifpp/cdunifpp_process.c

@@ -19 +19 @@
   PPzaxis *zaxis;
   PPtaxis *taxis;
   PPlevel *lev;
-  PPtime *time;
+  PPtime *time, *tval;
   void *oldptr;
   PPlist *heaplist, *xaxes, *yaxes, *zaxes, *taxes;
   PPlist *fieldvars;
-  PPlistpos handle;
+  PPlistpos handle, thandle;
   PPlist *gatts,*catts;
 
   int ndims, dimid;
@@ -38 +38 @@
   PPvar *ppvar;
   PPlist *axislist;
   void *axis;
-  char *tunits;
+  char *tunits, *calatt;
   int have_hybrid=1;
   PPaxistype axistype;
 
@@ -450 +450 @@
 
     while ((axis=pp_list_walk(axislist,0,&handle))!=NULL) {
 
+      units=NULL; /* reset */
+      axisname=NULL;
+      standardname=NULL;
+      pointspacing=NULL;
+      posdir=NULL;
+
       dim=&cudims[dimid];
       var=&cuvars[varid];
       ppdim=(PPdim*) dim->internp;
@@ -565 +571 @@
         taxis=(PPtaxis*) axis;
         taxis->dimid = dimid;   
         sprintf(dim->name,"time%d",idim);
+
+        switch(pp_calendar_type(taxis->type)) {
+        case gregorian:
+          calatt="gregorian";
+          break;
+        case cal360day:
+          calatt="360_day";
+          break;
+        case model:
+          pp_list_startwalk(taxis->values,&thandle);
+          tval = pp_list_walk(taxis->values,0,&thandle);
+          
+          taxis->time_orig.year  = tval->time1.year;
+          taxis->time_orig.month = tval->time1.month;
+          taxis->time_orig.day   = tval->time1.day;
+          taxis->time_orig.hour  = tval->time1.hour;
+          taxis->time_orig.minute= tval->time1.minute;
+          taxis->time_orig.second= tval->time1.second;
+          calatt="none";
+          break;
+        }
+        
+        if(   pp_add_string_att(ppvar->atts,"calendar",
+                                calatt,
+                                heaplist)   !=0) goto err;
+
         if((   tunits=pp_t_units(taxis,heaplist)   )==NULL) goto err;
         dim->len = pp_list_size(taxis->values);
         if((   ppvar->data = pp_taxis_to_values(taxis,heaplist)   )==NULL) goto err;
-        if(   pp_add_string_att(ppvar->atts,"calendar",
-                                pp_is_360day_calendar(taxis->type) ? "360_day" : "gregorian",
-                                heaplist)   !=0) goto err;
         axisname="T";
         standardname="time";
         units=tunits;
@@ -585 +614 @@
       var->ndims=1;
       var->dims[0] = dimid;
       
-      if (units) {
+      if (units != NULL) {
         if(   pp_add_string_att(ppvar->atts,"units",units,heaplist)   !=0) goto err;
         strncpy(dim->units,units,CU_MAX_NAME);
         dim->units[CU_MAX_NAME]='\0';
       }
 
-      if (axisname)
+      if (axisname != NULL)
         if(   pp_add_string_att(ppvar->atts,"axis",axisname,heaplist)   !=0) goto err;
 
-      if (standardname)
+      if (standardname != NULL)
         if(   pp_add_string_att(ppvar->atts,"standard_name",standardname,heaplist)   !=0) goto err;
       
-      if (pointspacing)
+      if (pointspacing != NULL)
         if(  pp_add_string_att(ppvar->atts,"point_spacing",pointspacing,heaplist)   !=0) goto err;
 
-      if (posdir)
+      if (posdir != NULL)
         if(   pp_add_string_att(ppvar->atts,"positive",posdir,heaplist)   !=0) goto err;
 
       varid++;