Changeset 5185 for LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/utilities

Timestamp:

Sep 11, 2024, 4:27:07 PM (19 months ago)

Author:

abarral

Message:

Replace REPROBUS CPP KEY by logical using handmade wonky wrapper

Location:

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/utilities

Files:

• easy_netcdf.F90 (modified) (16 diffs)
• print_matrix.F90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/utilities/easy_netcdf.F90

@@ -763 +763 @@
     DO j = 1, ndims
       n = n * ndimlens(j)
-      if (j > 1 .and. ndimlens(j) > 1) then
+      if (j > 1 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
              & var_name, &
@@ -821 +821 @@
     DO j = 1, ndims
       n = n * ndimlens(j)
-      if (j > 1 .and. ndimlens(j) > 1) then
+      if (j > 1 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
              & var_name, &
@@ -880 +880 @@
     DO j = 1, ndims
       n = n * ndimlens(j)
-      if (j > 1 .and. ndimlens(j) > 1) then
+      if (j > 1 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
              & var_name, &
@@ -940 +940 @@
     DO j = 1, ndims-1
       n = n * ndimlens(j)
-      if (j > 1 .and. ndimlens(j) > 1) then
+      if (j > 1 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading 1D slice from NetCDF variable ', &
              & var_name, &
@@ -1023 +1023 @@
     DO j = 1, ndims
       ntotal = ntotal * ndimlens(j)
-      if (j > 2 .and. ndimlens(j) > 1) then
+      if (j > 2 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
            & var_name, &
@@ -1135 +1135 @@
     DO j = 1, ndims
       ntotal = ntotal * ndimlens(j)
-      if (j > 2 .and. ndimlens(j) > 1) then
+      if (j > 2 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
            & var_name, &
@@ -1254 +1254 @@
     DO j = 1, ndims-1
       ntotal = ntotal * ndimlens(j)
-      if (j > 2 .and. ndimlens(j) > 1) then
+      if (j > 2 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading 2D slice from NetCDF variable ', &
            & var_name, &
@@ -1378 +1378 @@
     DO j = 1, ndims
       ntotal = ntotal * ndimlens(j)
-      if (j > 3 .and. ndimlens(j) > 1) then
+      if (j > 3 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
            & var_name, &
@@ -1514 +1514 @@
     DO j = 1, ndims-1
       ntotal = ntotal * ndimlens(j)
-      if (j > 3 .and. ndimlens(j) > 1) then
+      if (j > 3 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading 3D slice from NetCDF variable ', &
            & var_name, &
@@ -1656 +1656 @@
     DO j = 1, ndims
       ntotal = ntotal * ndimlens(j)
-      if (j > 4 .and. ndimlens(j) > 1) then
+      if (j > 4 .AND. ndimlens(j) > 1) then
         write(nulerr,'(a,a,a)') '*** Error reading NetCDF variable ', &
            & var_name, &
@@ -1987 +1987 @@
     end if
 
-    if (present(dim1_name) .and. ndims_input >= 1) then
+    if (present(dim1_name) .AND. ndims_input >= 1) then
       ! Variable is at least one dimensional
       ndims_local = 1
@@ -1996 +1996 @@
         call my_abort('Error writing NetCDF file')
       end if
-      if (present(dim2_name) .and. ndims_input >= 2) then
+      if (present(dim2_name) .AND. ndims_input >= 2) then
         ! Variable is at least two dimensional
         ndims_local = 2
@@ -2005 +2005 @@
           call my_abort('Error writing NetCDF file')
         end if
-        if (present(dim3_name) .and. ndims_input >= 3) then
+        if (present(dim3_name) .AND. ndims_input >= 3) then
           ! Variable is at least three dimensional
           ndims_local = 3
@@ -2014 +2014 @@
             call my_abort('Error writing NetCDF file')
           end if
-          if (present(dim4_name) .and. ndims_input >= 4) then
+          if (present(dim4_name) .AND. ndims_input >= 4) then
             ! Variable is at least three dimensional
             ndims_local = 4
@@ -2472 +2472 @@
     ! Check the total size of the variable to be stored (but receiving
     ! ntotal is zero then there must be an unlimited dimension)
-    if (ntotal /= size(var,kind=jpib) .and. ntotal /= 0) then
+    if (ntotal /= size(var,kind=jpib) .AND. ntotal /= 0) then
       write(nulerr,'(a,i0,a,a,a,i0)') '*** Error: attempt to write matrix of total size ', &
            & nvarlen, ' to ', var_name, ' which has total size ', ntotal
@@ -2551 +2551 @@
       write(var_slice_name,'(a,a,i0,a)') var_name, '(:,:,', index3, ')'
     end if
-    if (ntotal /= size(var,kind=jpib) .and. ntotal /= 0) then
+    if (ntotal /= size(var,kind=jpib) .AND. ntotal /= 0) then
       write(nulerr,'(a,i0,a,a,a,i0)') '*** Error: attempt to write matrix of total size ', &
            & nvarlen, ' to ', trim(var_slice_name), ' which has total size ', ntotal

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/utilities/print_matrix.F90

@@ -47 +47 @@
           write(unit_local,'(f16.8,$)') mat(i,j)
        end do
-       if (present(name) .and. i == size(mat,1)) then
+       if (present(name) .AND. i == size(mat,1)) then
          write(unit_local,'(a)') ']'
        else