2394 support char logical in psydata

lib/read_only/Makefile

@@ -50,8 +50,8 @@ PSYDATA_LIB_DIR ?= ./..
 
 # The read-only verification library is implemented for int, real and
 # double scalars and 2-dimension arrays
-PROCESS_ARGS = -prefix=read_only_verify_ -types=int,real,double \
-		       -dims=2
+PROCESS_ARGS = -prefix=read_only_verify_ -types=char,int,logical,real,double \
+		       -dims=1,2,3,4
 PROCESS = $$($(PSYDATA_LIB_DIR)/get_python.sh) $(PSYDATA_LIB_DIR)/process.py
 
 default: read_only_base.o psy_data_base.o

lib/read_only/read_only_base.jinja

@@ -284,16 +284,26 @@ contains
         character(*), intent(in) :: name
         {{type}}, intent(in)     :: value
 
-        {{type}}            :: orig_value
-        integer(kind=int64) :: checksum, int_64
+        {% if name == "Char" %}
+        character, allocatable   :: orig_value
+        integer                  :: i
+        {% else %}
+        {{type}}                 :: orig_value
+        {% endif %}
+        integer(kind=int64)      :: checksum, int_64
 
         {% if bits==32 %}
-        integer(kind=int32) :: int_32
+        integer(kind=int32)      :: int_32
         {% endif %}
 
         if (.not. is_enabled) return
 
-        {% if bits == 32 %}
+        {% if name == "Char" %}
+        checksum = 0
+        do i=1, len(value)
+            checksum = checksum + ichar(value(i:i))
+        enddo
+        {% elif bits == 32 %}
         ! `transfer` leaves undefined bits in a 64-bit value
         ! so assign to 32-bit, then assign to 64-bit to have all bits defined
         int_32 = transfer(value, int_32)
@@ -315,20 +325,22 @@ contains
                 write(stderr,*) "------------- PSyData -------------------------"
                 write(stderr,*) "{{type}} variable ", name, " has been modified in ", &
                     trim(this%module_name)," : ", trim(this%region_name)
-                ! We can recreate the original value which is stored as
-                ! 64-bit integer as the checksum:
-                {% if bits == 32 %}
+              {% if name != "Char" %}
+                ! We can recreate the original scalar value which is stored as
+                ! 64-bit integer in the checksum:
+               {% if bits == 32 %}
                 int_32 = this%checksums(this%next_var_index)
                 orig_value = transfer(int_32, orig_value)
-                {% elif bits == 64 %}
+               {% elif bits == 64 %}
                 orig_value = transfer(this%checksums(this%next_var_index), orig_value)
-                {% elif name == "Logical" %}
+               {% elif name == "Logical" %}
                 orig_value = this%checksums(this%next_var_index) .eq. 1
-                {% else %}
+               {% else %}
                 ERROR - UNSUPPORTED BIT SIZE {{bits}}!
-                {% endif %}
+               {% endif %}
                 write(stderr,*) "Original value: ", orig_value
                 write(stderr,*) "New value:      ", value
+              {% endif %}
                 write(stderr,*) "------------- PSyData -------------------------"
             else if(this%verbosity>1) then
                 write(stderr,*) "PSyData: checked variable ", trim(name)
@@ -400,7 +412,9 @@ contains
         {{type}}, dimension({{DIMENSION}}) :: field
 
         integer :: {{vars}}
-        {% if bits == 32 %}
+        {% if name == "Char" %}
+        integer :: i
+        {% elif bits == 32 %}
         integer(kind=int32) :: int_32
         {% endif %}
         integer(kind=int64) :: checksum, int_64
@@ -410,7 +424,12 @@ contains
         {% for j in range(dim, 0, -1) %}
         {{" "*3*(dim-j)}}do i{{j}}=1, size(field, {{j}})
         {% endfor %}
-        {% if bits == 32 %}
+        {% if name == "Char" %}
+        {{indent}}int_64 = 0
+        {{indent}}do i=1, len(field({{vars}}))
+        {{indent}}    int_64 = int_64 + ichar(field({{vars}})(i:i))
+        {{indent}}enddo
+        {% elif bits == 32 %}
         {{indent}}! transfer leaves undefined bits in a 64-bit target
         {{indent}}! so we transfer to 32-bits and then assign to 64-bit
         {{indent}}int_32 = transfer(field({{vars}}), int_32)

lib/value_range_check/Makefile

@@ -50,8 +50,8 @@ PSYDATA_LIB_DIR ?= ./..
 
 # The nan-test library is implemented for int, real and
 # double scalars and 2-dimension arrays
-PROCESS_ARGS = -prefix=value_range_check_ -types=int,real,double \
-		       -dims=2
+PROCESS_ARGS = -prefix=value_range_check_ -types=char,int,logical,real,double \
+		       -dims=1,2,3,4
 PROCESS = $$($(PSYDATA_LIB_DIR)/get_python.sh) $(PSYDATA_LIB_DIR)/process.py
 
 

lib/value_range_check/value_range_check_base.jinja

@@ -33,9 +33,11 @@
    when mould is larger than value.) #}
 
 {% if ALL_TYPES is not defined %}
-   {% set ALL_TYPES = [ ("Double", "real(kind=real64)",   64),
-                        ("Real",   "real(kind=real32)",   32),
-                        ("Int",    "integer(kind=int32)", 32) ] %}
+   {% set ALL_TYPES = [ ("Double",  "real(kind=real64)",   64),
+                        ("Real",    "real(kind=real32)",   32),
+                        ("Char",    "character",            8),
+                        ("Logical", "logical",              8),
+                        ("Int",     "integer(kind=int32)", 32) ] %}
 {% endif %}
 
 ! -----------------------------------------------------------------------------
@@ -346,11 +348,11 @@ contains
                                   this%value_ranges(this%next_var_index,:))
         endif
 
-        {% if name !="Logical" %}
+        {% if name not in ["Logical", "Char"] %}
 
         if (this%has_checks(this%next_var_index) == has_min) then
             {# The spaces take care of proper indentation #}
-            {{indent}}if (value< this%value_ranges(this%next_var_index,1)) then
+            {{indent}}if (value < this%value_ranges(this%next_var_index,1)) then
             {{indent}}    write(stderr, '(11G0)') "PSyData: Variable '",                    &
             {{indent}}                     name,"' has the value ",                         &
             {{indent}}                     value, " in module '", trim(this%module_name),   &
@@ -383,7 +385,7 @@ contains
         endif
         {% endif %}
 
-        {% if name not in ["Int", "Logical"] %}
+        {% if name not in ["Int", "Char", "Logical"] %}
         if (IEEE_SUPPORT_DATATYPE(value)) then
             if (.not. IEEE_IS_FINITE(value)) then
                 write(stderr, '(8G0)') "PSyData: Variable '", name,"' has invalid value ", &
@@ -431,7 +433,7 @@ contains
         {{type}}, dimension({{DIMENSION}}), intent(in) :: value
 
         {# IEEE_SUPPORT_DATATYPE does not even compile for int data types #}
-        {% if name not in ["Int", "Logical"] %}
+        {% if name not in ["Int", "Char", "Logical"] %}
         integer :: {{vars}}
 
         if (.not. is_enabled) return