Changeset 2590

Timestamp:

Dec 3, 2021, 3:02:20 PM (3 years ago)

Author:

lrossi

Message:

MARS GCM

Utils: fixed a bug in concatnc. The program now properly carries over missing
values from the input files into the output file.

LR

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• util/concatnc.F90 (modified) (6 diffs)

trunk/LMDZ.MARS/README

@@ -3532 +3532 @@
    => new flag: meteo_flux
    => new input file in datadir: Meteo_flux_Plane_v2.dat
+
+== 03/12/2021 == LR
+Utils: fixed a bug in concatnc. The program now properly carries over missing
+values from the input files into the output file.

trunk/LMDZ.MARS/util/concatnc.F90

@@ -48 +48 @@
 character (len=4) :: axis
 ! axis:  "sol" or "ls" or "adls"
-integer :: nid,ierr,miss
+integer :: nid,ierr,miss,validr
 ! nid: [netcdf] file ID #
 ! ierr: [netcdf] subroutine returned error code
@@ -694 +694 @@
       ierr = NF_GET_VAR_REAL(nid,varid,var3d)
       ierr= NF_PUT_VARA_REAL(nout,varidout,corner,edges,var3d)
+      validr=NF_GET_ATT_REAL(nid,varid,"valid_range",valid_range)
       miss=NF_GET_ATT_REAL(nid,varid,"missing_value",[missing])
-      miss=NF_GET_ATT_REAL(nid,varid,"valid_range",valid_range)
 
       if (ierr.ne.NF_NOERR) then
@@ -702 +702 @@
       endif
 
-! In case there is a "valid_range" attribute
+! In case there is a "missing_value" attribute
       ! Write "valid_range" and "missing_value" attributes in output file
       if (miss.eq.NF_NOERR) then
-         call missing_value(nout,varidout,valid_range,missing)
+         call missing_value(nout,varidout,validr,miss,valid_range,missing)
       endif
 
@@ -1465 +1465 @@
 end subroutine sol2ls
 !******************************************************************************
-subroutine  missing_value(nout,nvarid,valid_range,missing)
+subroutine  missing_value(nout,nvarid,validr,miss,valid_range,missing)
 !==============================================================================
 ! Purpose:
@@ -1487 +1487 @@
 integer, intent(in) :: nvarid
 ! varid: [netcdf] variable ID #
+integer, intent(in) :: validr
+! validr : [netcdf] routines return code for "valid_range" attribute
+integer, intent(in) :: miss
+! miss : [netcdf] routines return code for "missing_value" attribute
 real, dimension(2), intent(in) :: valid_range
 ! valid_range(2): [netcdf] "valid_range" attribute (min and max)
@@ -1509 +1513 @@
 
 ! Write valid_range() attribute
-ierr=NF_PUT_ATT_REAL(nout,nvarid,'valid_range',NF_FLOAT,2,valid_range)
-
-if (ierr.ne.NF_NOERR) then
-   print*,'missing_value: valid_range attribution failed'
-   print*, NF_STRERROR(ierr)
-   !write(*,*) 'NF_NOERR', NF_NOERR
-   !CALL abort
-   stop
+if (validr.eq.NF_NOERR) then
+  ierr=NF_PUT_ATT_REAL(nout,nvarid,'valid_range',NF_FLOAT,2,valid_range)
+
+  if (ierr.ne.NF_NOERR) then
+     print*,'missing_value: valid_range attribution failed'
+     print*, NF_STRERROR(ierr)
+     !write(*,*) 'NF_NOERR', NF_NOERR
+     !CALL abort
+     stop
+  endif
 endif
 
 ! Write "missing_value" attribute
-ierr= NF_PUT_ATT_REAL(nout,nvarid,'missing_value',NF_FLOAT,1,[missing])
-
-if (ierr.NE.NF_NOERR) then
-   print*, 'missing_value: missing value attribution failed'
-   print*, NF_STRERROR(ierr)
-!    WRITE(*,*) 'NF_NOERR', NF_NOERR
-!    CALL abort
-   stop
+if (miss.eq.NF_NOERR) then
+   ierr= NF_PUT_ATT_REAL(nout,nvarid,'missing_value',NF_FLOAT,1,[missing])
+
+   if (ierr.NE.NF_NOERR) then
+      print*, 'missing_value: missing value attribution failed'
+      print*, NF_STRERROR(ierr)
+   !    WRITE(*,*) 'NF_NOERR', NF_NOERR
+   !    CALL abort
+      stop
+   endif
 endif