Changeset 5271 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Oct 24, 2024, 4:25:39 PM (5 weeks ago)

Author:

abarral

Message:

Move dimensions.h into a module
Nb: doesn't compile yet

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• cv30_routines.F90 (modified) (1 diff)
• isotopes_routines_mod.F90 (modified) (12 diffs)
• phyredem.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmdiso/cv30_routines.F90

@@ -6360 +6360 @@
         ! Toutes les autres variables fn de ep sont calculees plus bas.
 
-#include "cvthermo.h"
-#include "cv30param.h"
-#include "conema3.h"
+INCLUDE "cvthermo.h"
+INCLUDE "cv30param.h"
+INCLUDE "conema3.h"
 
 ! inputs:

LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90

@@ -28 +28 @@
 implicit none
 
-#include "YOMCST.h"       
+INCLUDE "YOMCST.h"
 
 ! inputs
@@ -12969 +12969 @@
     USE isotrac_mod, ONLY: izone_cont,index_zone,index_iso
 #endif
-        implicit none
+        USE dimensions_mod, ONLY: iim, jjm, llm, ndm
+implicit none
 
         ! gestion de la neige: on precipte dessus, sublime, effondre,
@@ -12975 +12976 @@
         ! commun aux dfférentes sous-surfaces.
 
-#include "YOETHF.h" 
-#include "FCTTRE.h"   
-#include "YOMCST.h"
-!#include "dimensions.h"
-!#include "paramet.h"
+INCLUDE "YOETHF.h"
+INCLUDE "FCTTRE.h"
+INCLUDE "YOMCST.h"
+!
+!INCLUDE "paramet.h"
 
          ! inputs
@@ -13543 +13544 @@
         implicit none
 
-#include "YOETHF.h"         
-#include "FCTTRE.h"   
-#include "YOMCST.h"
+INCLUDE "YOETHF.h"
+INCLUDE "FCTTRE.h"
+INCLUDE "YOMCST.h"
         
         ! inputs
@@ -14456 +14457 @@
 #endif
 
-        implicit none
-
-#include "YOETHF.h" 
-#include "FCTTRE.h"   
-#include "YOMCST.h"
-!#include "dimensions.h"
-!#include "paramet.h"
+        USE dimensions_mod, ONLY: iim, jjm, llm, ndm
+implicit none
+
+INCLUDE "YOETHF.h"
+INCLUDE "FCTTRE.h"
+INCLUDE "YOMCST.h"
+!
+!INCLUDE "paramet.h"
         
         ! inputs
@@ -15875 +15877 @@
       ! equivalent de phyetat0 pour les isotopes  
 
-#include "dimsoil.h"
-#include "clesphys.h"
-#include "compbl.h"      
+INCLUDE "dimsoil.h"
+INCLUDE "clesphys.h"
+INCLUDE "compbl.h"
 
 !#ifdef ISOVERIF
@@ -16050 +16052 @@
         implicit none
 
-#include "dimsoil.h"
-#include "clesphys.h"
-!  #include "thermcell.h"
-#include "compbl.h"
+INCLUDE "dimsoil.h"
+INCLUDE "clesphys.h"
+!  INCLUDE "thermcell.h"
+INCLUDE "compbl.h"
 
         ! arguments  
@@ -16427 +16429 @@
    IMPLICIT NONE
 
-#include "dimsoil.h"
-#include "clesphys.h"
-#include "compbl.h"    
+INCLUDE "dimsoil.h"
+INCLUDE "clesphys.h"
+INCLUDE "compbl.h"
 
    REAL, INTENT(IN) ::             snow     (klon,nbsrf)
@@ -16638 +16640 @@
       implicit none
 
-#include "YOMCST.h"
+INCLUDE "YOMCST.h"
 
 ! input
@@ -18234 +18236 @@
         USE isotopes_verif_mod
 #endif
-      implicit none
-
-#include "YOMCST.h"
-#include "dimensions.h"
+      USE dimensions_mod, ONLY: iim, jjm, llm, ndm
+implicit none
+
+INCLUDE "YOMCST.h"
+
 ! pour avoir iim et jjm
 
@@ -18379 +18382 @@
       implicit none
 
-#include "YOMCST.h"
+INCLUDE "YOMCST.h"
 
 !     Arguments
@@ -18543 +18546 @@
         ! normallement, niso en dimension suffirait, mais serait pas
         ! cohérent avec les dimensions dans condiso_liq_ice
-!#include "iso_verif.h"
+!INCLUDE "iso_verif.h"
 
         ! verif que qt n'est pas nul

LMDZ6/trunk/libf/phylmdiso/phyredem.F90

@@ -519 +519 @@
         ! equivalent isotopique de phyredem
 
-#include "dimsoil.h"
-#include "clesphys.h"
-#include "alpale.h"
-#include "compbl.h"      
+INCLUDE "dimsoil.h"
+INCLUDE "clesphys.h"
+INCLUDE "alpale.h"
+INCLUDE "compbl.h"
       ! inputs
       !REAL xtsol(niso,klon)