Changeset 4283 for LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nolic_mod.F90

Timestamp:

Sep 26, 2022, 2:43:00 PM (19 months ago)

Author:

jghattas

Message:

Added landice_opt=2 : Treat continental land ice fractions in ORCHIDEE => pctsrf(:,is_lic) = 0.0 in LMDZ.

For this option, some more variables are needed from ORCHIDEE. Therfor change in the interface LMDZ-ORCHIDEE in surf_land_orchidee_mod is done. Previous interface is moved to surf_land_orchidee_nolic_mod.f90. To compile with previous interface, cpp key ORCHIDEE_NOLIC is added. Previous interface is compiled with argument orchidee2.1 in makelmdz and makelmdz_fcm.

At the same time, when the interface was changed, the variable yrmu0(coszang) was added in the call to intersurf_initialize_gathered. This is needed in ORCHIDEE to better initialize the model.

Modifications done by Etienne Vignon and Josefine Ghattas

File:

• LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nolic_mod.F90 (copied) (copied from LMDZ6/trunk/libf/phylmd/surf_land_orchidee_mod.F90) (2 diffs)

LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nolic_mod.F90

@@ -1 +1 @@
 !
-MODULE surf_land_orchidee_mod
-#ifndef ORCHIDEE_NOOPENMP
-#ifndef ORCHIDEE_NOZ0H
-#ifndef ORCHIDEE_NOFREIN
-#ifndef ORCHIDEE_NOUNSTRUCT
+MODULE surf_land_orchidee_nolic_mod
+#ifdef ORCHIDEE_NOLIC
 !
 ! This module controles the interface towards the model ORCHIDEE.
 !
 ! Compatibility with ORCHIDIEE :
-! The current version can be used with ORCHIDEE/trunk from revision 4465.
-! This interface is used if none of the cpp keys ORCHIDEE_NOOPENMP, 
-! ORCHIDEE_NOZ0H or ORCHIDEE_NOFREIN is set.
-!
+! This module is compiled only if cpp key ORCHIDEE_NOLIC is defined. 
+! The current version can be used with ORCHIDEE/trunk from revision 4465-7757. 
+! (it can be used for later revisions also but it is not needed.)
+! 
 ! Subroutines in this module : surf_land_orchidee
 !                              Init_orchidee_index
@@ -847 +844 @@
 !
 #endif
-#endif
-#endif
-#endif
-END MODULE surf_land_orchidee_mod
+END MODULE surf_land_orchidee_nolic_mod