Changeset 5075 for LMDZ6/trunk/libf/phylmd/inlandsis

Timestamp:

Jul 19, 2024, 10:05:57 AM (4 months ago)

Author:

abarral

Message:

[continued & end] replace netcdf by lmdz_netcdf.F90 wrapper
"use netcdf" is now only used in lmdz_netcdf.F90 (except ecrad and obsolete/)
<include "netcdf.inc"> is now likewise only used in lmdz_netcdf.F90.

systematically specify explicitely <USE lmdz_netcdf, ONLY:> (probably left some missing, to correct later on)

Further replacement of nf_put_* by nf90_put_* (same for _get_)

[minor] replace deprecated boolean operators along the way

File:

• LMDZ6/trunk/libf/phylmd/inlandsis/surf_inlandsis_mod.F90 (modified) (20 diffs)

LMDZ6/trunk/libf/phylmd/inlandsis/surf_inlandsis_mod.F90

@@ -638 +638 @@
             END DO
 
-            IF (sissnow(ikl) .LE. sn_low) THEN  !add snow
-                IF (isnoSV(ikl).GE.1) THEN
+            IF (sissnow(ikl) <= sn_low) THEN  !add snow
+                IF (isnoSV(ikl)>=1) THEN
                     dzsnSV(ikl, 1) = dzsnSV(ikl, 1) + sn_add / max(ro__SV(ikl, 1), epsi)
                     toicSV(ikl) = toicSV(ikl) - sn_add
@@ -657 +657 @@
             END IF
 
-            IF (sissnow(ikl) .ge. sn_upp) THEN  !thinnen snow layer below
+            IF (sissnow(ikl) >= sn_upp) THEN  !thinnen snow layer below
                 dzsnSV(ikl, 1) = dzsnSV(ikl, 1) / sn_div
                 toicSV(ikl) = toicSV(ikl) + dzsnSV(ikl, 1) * ro__SV(ikl, 1) / sn_div
@@ -1049 +1049 @@
         ! Objet: Lecture du fichier de conditions initiales pour SISVAT
         !======================================================================
-        include "netcdf.inc"
         !    include "indicesol.h"
 
@@ -1118 +1117 @@
 
         DO isn = 1, nsno
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("AGESNOW" // str2, &
@@ -1128 +1127 @@
         ENDDO
         DO isn = 1, nsno
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("DZSNOW" // str2, &
@@ -1138 +1137 @@
         ENDDO
         DO isn = 1, nsno
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("G2SNOW" // str2, &
@@ -1148 +1147 @@
         ENDDO
         DO isn = 1, nsno
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("G1SNOW" // str2, &
@@ -1158 +1157 @@
         ENDDO
         DO isn = 1, nsismx
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("ETA" // str2, &
@@ -1168 +1167 @@
         ENDDO
         DO isn = 1, nsismx
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("RO" // str2, &
@@ -1178 +1177 @@
         ENDDO
         DO isn = 1, nsismx
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("TSS" // str2, &
@@ -1188 +1187 @@
         ENDDO
         DO isn = 1, nsno
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("HISTORY" // str2, &
@@ -1287 +1286 @@
         IMPLICIT none
 
-        include "netcdf.inc"
         !    include "indicesol.h"
         !    include "dimsoil.h"
@@ -1403 +1401 @@
 
             DO isn = 1, nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "AGESNOW" // str2, &
@@ -1414 +1412 @@
             ENDDO
             DO isn = 1, nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "DZSNOW" // str2, &
@@ -1425 +1423 @@
             ENDDO
             DO isn = 1, nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "G2SNOW" // str2, &
@@ -1436 +1434 @@
             ENDDO
             DO isn = 1, nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "G1SNOW" // str2, &
@@ -1447 +1445 @@
             ENDDO
             DO isn = 1, nsismx
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "ETA" // str2, &
@@ -1458 +1456 @@
             ENDDO
             DO isn = 1, nsismx   !nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "RO" // str2, &
@@ -1469 +1467 @@
             ENDDO
             DO isn = 1, nsismx
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "TSS" // str2, &
@@ -1480 +1478 @@
             ENDDO
             DO isn = 1, nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "HISTORY" // str2, &