Changeset 5298 for LMDZ6/trunk/libf/phylmd

Timestamp:

Oct 30, 2024, 2:26:24 PM (8 months ago)

Author:

abarral

Message:

Turn planete.h comsoil.h into module
Remove obsolete message related to /scratch/ common

Location:

LMDZ6/trunk/libf/phylmd

Files:

• comsoil_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/phylmd/comsoil.h) (1 diff)
• conf_phys_m.f90 (modified) (3 diffs)
• inlandsis/sisvat_ts2.f90 (modified) (3 diffs)
• planete_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/phylmd/planete.h) (1 diff)
• soil.f90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/comsoil_mod_h.f90

@@ -1 @@
-!
-! $Header$
-!
+! Replaces comsoil.h
 
-      common /comsoil/inertie_sol,inertie_sno,inertie_sic,inertie_lic,  &
-     &                iflag_sic,iflag_inertie
-      real inertie_sol,inertie_sno,inertie_sic,inertie_lic
-      integer iflag_sic,iflag_inertie
-!$OMP THREADPRIVATE(/comsoil/)
+MODULE comsoil_mod_h
+  IMPLICIT NONE; PRIVATE
+  PUBLIC inertie_sol, inertie_sno, inertie_sic, inertie_lic, iflag_sic, iflag_inertie
+
+  REAL inertie_sol, inertie_sno, inertie_sic, inertie_lic
+  INTEGER iflag_sic, iflag_inertie
+  !$OMP THREADPRIVATE(inertie_sol,inertie_sno,inertie_sic,inertie_lic, iflag_sic,iflag_inertie)
+END MODULE comsoil_mod_h

LMDZ6/trunk/libf/phylmd/conf_phys_m.f90

@@ -24 +24 @@
        alp_offset)
 
-USE compbl_mod_h
+    USE compbl_mod_h
     USE alpale_mod
     USE conema3_mod_h
-        USE yomcst_mod_h
-USE IOIPSL
+    USE yomcst_mod_h
+    USE IOIPSL
     USE surface_data
     USE phys_cal_mod
@@ -41 +41 @@
     USE infotrac_phy, ONLY: type_trac
     USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_STRATAER
+    USE comsoil_mod_h
 
     INCLUDE "nuage.h"
@@ -46 +47 @@
     INCLUDE "YOMCST2.h"
 
-    !IM : on inclut/initialise les taux de CH4, N2O, CFC11 et CFC12
-    INCLUDE "comsoil.h"
     INCLUDE "YOEGWD.h"
     !

LMDZ6/trunk/libf/phylmd/inlandsis/sisvat_ts2.f90

@@ -58 +58 @@
   ! |________________________________________________________________________|
 
-USE yoethf_mod_h
-    USE VAR_SV
+  USE yoethf_mod_h
+  USE VAR_SV
   USE VARdSV
-
   USE VARySV
   USE VARtSV
@@ -67 +66 @@
   USE VARphy
   USE indice_sol_mod
-
-
   USE yomcst_mod_h
+  USE comsoil_mod_h
 IMPLICIT NONE
 
@@ -75 +73 @@
   ! +--Global Variables
   ! +  ================
-
-
   INCLUDE "FCTTRE.h"
-   ! INCLUDE "indicesol.h"
-  INCLUDE "comsoil.h"
-   ! include  "LMDZphy.inc"
 
   ! +--OUTPUT for Stand Alone NetCDF File

LMDZ6/trunk/libf/phylmd/planete_mod_h.f90

@@ -1 @@
-!-----------------------------------------------------------------------
-! INCLUDE planet.h
+MODULE planete_mod_h
+  IMPLICIT NONE; PRIVATE
+  PUBLIC aphelie, periheli, year_day, peri_day, obliquit, timeperi, e_elips, p_elips, unitastr
 
-      COMMON/planet/aphelie,periheli,year_day,peri_day, obliquit, timeperi,&
-           e_elips,p_elips,unitastr
+  REAL aphelie, periheli, year_day, peri_day, obliquit, timeperi, e_elips, &
+          p_elips, unitastr
 
-      REAL aphelie,periheli,year_day,peri_day, obliquit, timeperi,e_elips, &
-           p_elips,unitastr
-
-!-----------------------------------------------------------------------
-!$OMP THREADPRIVATE(/planet/)
+  !$OMP THREADPRIVATE(aphelie, periheli, year_day, peri_day, obliquit, timeperi, e_elips, p_elips, unitastr)
+END MODULE planete_mod_h

LMDZ6/trunk/libf/phylmd/soil.f90

@@ -11 +11 @@
   USE print_control_mod, ONLY: lunout
   USE dimsoil_mod_h, ONLY: nsoilmx
-
+  USE comsoil_mod_h
   IMPLICIT NONE
 
@@ -62 +62 @@
 !
 !=======================================================================
-  INCLUDE "comsoil.h"
-!-----------------------------------------------------------------------
 ! Arguments
 ! ---------