Changeset 4446 for LMDZ6/branches/Portage_acc/libf/phylmd/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/phylmd/surf_land_mod.F90 (modified) (3 diffs)

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

@@ -24 +24 @@
     USE dimphy
     USE surface_data, ONLY    : ok_veget
-! >> PC
-    USE carbon_cycle_mod 
-! << PC
+    USE carbon_cycle_mod
+
 
     ! See comments in each module surf_land_orchidee_xxx for compatiblity with ORCHIDEE
@@ -45 +44 @@
     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
     USE surf_land_orchidee_mod
 #endif
@@ -50 +54 @@
 #endif
 #endif
-
+#endif
+    
     USE surf_land_bucket_mod
     USE calcul_fluxs_mod
     USE indice_sol_mod
-
-! >> PC
     USE print_control_mod, ONLY: lunout
-! << PC
 
     INCLUDE "dimsoil.h"