Changeset 2484 for trunk

Timestamp:

Mar 25, 2021, 8:07:25 AM (4 years ago)

Author:

emillour

Message:

Generic GCM:
Small fix on the reading/initialisation of Non orographic GW related fields
loaded by lect_start_archive
EM

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/dynphy_lonlat/phystd/lect_start_archive.F (modified) (4 diffs)

trunk/LMDZ.GENERIC/README

@@ -1637 +1637 @@
 Add kmixmin 1D minimum eddy mix coeff for turbdiff as rcm1d.def option
 and comment lines to help coding specific eddy mix coeff in turbdiff with Earth example
+
+== 25/03/2021 == EM
+Small fix on the reading/initialisation of Non orographic GW related fields
+loaded by lect_start_archive

trunk/LMDZ.GENERIC/libf/dynphy_lonlat/phystd/lect_start_archive.F

@@ -966 +966 @@
          PRINT*, "Setting it to zero"
          du_nonoro_gwdold(:,:,:)=0
-      ENDIF
-#ifdef NC_DOUBLE
-      ierr = NF_GET_VARA_DOUBLE(nid,nvarid,start,count,du_nonoro_gwdold)
-#else
-      ierr = NF_GET_VARA_REAL(nid,nvarid,start,count,du_nonoro_gwdold)
-#endif
-      IF (ierr .NE. NF_NOERR) THEN
-         PRINT*, "lect_start_archive: Failed loading <du_nonoro_gwd>"
-         CALL abort
+      ELSE
+#ifdef NC_DOUBLE
+        ierr=NF_GET_VARA_DOUBLE(nid,nvarid,start,count,du_nonoro_gwdold)
+#else
+        ierr=NF_GET_VARA_REAL(nid,nvarid,start,count,du_nonoro_gwdold)
+#endif
+        IF (ierr .NE. NF_NOERR) THEN
+          PRINT*, "lect_start_archive: Failed loading <du_nonoro_gwd>"
+          CALL abort
+        ENDIF
       ENDIF
 
@@ -983 +984 @@
          PRINT*, "Setting it to zero"
          dv_nonoro_gwdold(:,:,:)=0
-      ENDIF
-#ifdef NC_DOUBLE
-      ierr = NF_GET_VARA_DOUBLE(nid,nvarid,start,count,dv_nonoro_gwdold)
-#else
-      ierr = NF_GET_VARA_REAL(nid,nvarid,start,count,dv_nonoro_gwdold)
-#endif
-      IF (ierr .NE. NF_NOERR) THEN
-         PRINT*, "lect_start_archive: Failed loading <dv_nonoro_gwd>"
-         CALL abort
+      ELSE
+#ifdef NC_DOUBLE
+        ierr=NF_GET_VARA_DOUBLE(nid,nvarid,start,count,dv_nonoro_gwdold)
+#else
+        ierr=NF_GET_VARA_REAL(nid,nvarid,start,count,dv_nonoro_gwdold)
+#endif
+        IF (ierr .NE. NF_NOERR) THEN
+          PRINT*, "lect_start_archive: Failed loading <dv_nonoro_gwd>"
+          CALL abort
+        ENDIF
       ENDIF
 
@@ -1000 +1002 @@
          PRINT*, "Setting it to zero"
          east_gwstressold(:,:,:)=0
-      ENDIF
-#ifdef NC_DOUBLE
-      ierr = NF_GET_VARA_DOUBLE(nid,nvarid,start,count,east_gwstressold)
-#else
-      ierr = NF_GET_VARA_REAL(nid,nvarid,start,count,east_gwstressold)
-#endif
-      IF (ierr .NE. NF_NOERR) THEN
-         PRINT*, "lect_start_archive: Failed loading <east_gwstress>"
-         CALL abort
+      ELSE
+#ifdef NC_DOUBLE
+        ierr=NF_GET_VARA_DOUBLE(nid,nvarid,start,count,east_gwstressold)
+#else
+        ierr=NF_GET_VARA_REAL(nid,nvarid,start,count,east_gwstressold)
+#endif
+        IF (ierr .NE. NF_NOERR) THEN
+          PRINT*, "lect_start_archive: Failed loading <east_gwstress>"
+          CALL abort
+        ENDIF
       ENDIF
 
@@ -1017 +1020 @@
          PRINT*, "Setting it to zero"
          west_gwstressold(:,:,:)=0
-      ENDIF
-#ifdef NC_DOUBLE
-      ierr = NF_GET_VARA_DOUBLE(nid,nvarid,start,count,west_gwstressold)
-#else
-      ierr = NF_GET_VARA_REAL(nid,nvarid,start,count,west_gwstressold)
-#endif
-      IF (ierr .NE. NF_NOERR) THEN
-         PRINT*, "lect_start_archive: Failed loading <west_gwstress>"
-         CALL abort
+      ELSE
+#ifdef NC_DOUBLE
+        ierr=NF_GET_VARA_DOUBLE(nid,nvarid,start,count,west_gwstressold)
+#else
+        ierr=NF_GET_VARA_REAL(nid,nvarid,start,count,west_gwstressold)
+#endif
+        IF (ierr .NE. NF_NOERR) THEN
+          PRINT*, "lect_start_archive: Failed loading <west_gwstress>"
+          CALL abort
+        ENDIF
       ENDIF