Changeset 4446 for LMDZ6/branches/Portage_acc/libf/phylmdiso/surf_land_mod.F90

Timestamp:

Mar 1, 2023, 6:22:39 PM (19 months ago)

Author:

Laurent Fairhead

Message:

Merged trunk revisions from 4127 to 4443 (HEAD) into branch

File:

• LMDZ6/branches/Portage_acc/libf/phylmdiso/surf_land_mod.F90 (modified) (7 diffs)

LMDZ6/branches/Portage_acc/libf/phylmdiso/surf_land_mod.F90

@@ -30 +30 @@
     USE dimphy
     USE surface_data, ONLY    : ok_veget
-! >> PC
     USE carbon_cycle_mod 
-! << PC
 
     ! See comments in each module surf_land_orchidee_xxx for compatiblity with ORCHIDEE
@@ -51 +49 @@
     USE surf_land_orchidee_nounstruct_mod
 #else
+#if ORCHIDEE_NOLIC
+    ! Compilation with cpp key ORCHIDEE_NOLIC
+    USE surf_land_orchidee_nolic_mod
+#else
+    ! Default version#else
     USE surf_land_orchidee_mod
+#endif
 #endif
 #endif
@@ -61 +65 @@
     USE indice_sol_mod
 #ifdef ISO
-    use infotrac_phy, ONLY: ntraciso,niso
+    use infotrac_phy, ONLY: ntiso,niso
     use isotopes_mod, ONLY: nudge_qsol, iso_eau
 #ifdef ISOVERIF
@@ -67 +71 @@
 #endif
 #endif
-
-! >> PC
+    
     USE print_control_mod, ONLY: lunout
-! << PC
 
     INCLUDE "dimsoil.h"
@@ -104 +106 @@
     REAL, DIMENSION(klon), INTENT(IN)       :: q2m, t2m
 #ifdef ISO
-    REAL, DIMENSION(ntraciso,klon), INTENT(IN)       :: xtprecip_rain, xtprecip_snow
-    REAL, DIMENSION(ntraciso,klon), INTENT(IN)       :: xtspechum
+    REAL, DIMENSION(ntiso,klon), INTENT(IN)       :: xtprecip_rain, xtprecip_snow
+    REAL, DIMENSION(ntiso,klon), INTENT(IN)       :: xtspechum
 #endif 
 
@@ -135 +137 @@
     REAL, DIMENSION(klon,nvm_lmdz), INTENT(OUT) :: height
 #ifdef ISO
-    REAL, DIMENSION(ntraciso,klon), INTENT(OUT)      :: xtevap
+    REAL, DIMENSION(ntiso,klon), INTENT(OUT)      :: xtevap
     REAL, DIMENSION(klon), INTENT(OUT)      :: h1
     REAL, DIMENSION(niso,klon), INTENT(OUT)      :: xtrunoff_diag
@@ -181 +183 @@
 !       write(*,*) 'surf_land 169: ok_veget=',ok_veget
         do i=1,knon
-         do ixt=1,ntraciso
+         do ixt=1,ntiso
            call iso_verif_noNaN(xtprecip_snow(ixt,i),'surf_land 146')
          enddo