Changeset 5314

Timestamp:

Nov 5, 2024, 12:37:47 PM (3 weeks ago)

Author:

abarral

Message:

Turn raddimlw.h radepsi.h radopt.h into modules
Move unused raddim.*.h to obsolete

Location:

LMDZ6/trunk/libf

Files:

• obsolete/raddim.160.98.h (moved) (moved from LMDZ6/trunk/libf/phylmd/raddim.160.98.h)
• obsolete/raddim.192.143.h (moved) (moved from LMDZ6/trunk/libf/phylmd/raddim.192.143.h)
• obsolete/raddim.32.24.h (moved) (moved from LMDZ6/trunk/libf/phylmd/raddim.32.24.h)
• obsolete/raddim.48.32.h (moved) (moved from LMDZ6/trunk/libf/phylmd/raddim.48.32.h)
• obsolete/raddim.72.46.h (moved) (moved from LMDZ6/trunk/libf/phylmd/raddim.72.46.h)
• obsolete/raddim.96.72.h (moved) (moved from LMDZ6/trunk/libf/phylmd/raddim.96.72.h)
• obsolete/raddim.defaut.h (moved) (moved from LMDZ6/trunk/libf/phylmd/raddim.defaut.h)
• obsolete/raddim.h (moved) (moved from LMDZ6/trunk/libf/phylmd/raddim.h)
• phylmd/physiq_mod.F90 (modified) (2 diffs)
• phylmd/raddimlw_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/phylmd/raddimlw.h) (1 diff)
• phylmd/radepsi_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/phylmd/radepsi.h) (1 diff)
• phylmd/radiation_AR4.f90 (modified) (18 diffs)
• phylmd/radopt_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/phylmd/radopt.h) (1 diff)
• phylmdiso/physiq_mod.F90 (modified) (2 diffs)
• phylmdiso/raddim.160.98.h (deleted)
• phylmdiso/raddim.192.143.h (deleted)
• phylmdiso/raddim.32.24.h (deleted)
• phylmdiso/raddim.48.32.h (deleted)
• phylmdiso/raddim.72.46.h (deleted)
• phylmdiso/raddim.96.72.h (deleted)
• phylmdiso/raddim.defaut.h (deleted)
• phylmdiso/raddim.h (deleted)
• phylmdiso/raddimlw_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/phylmdiso/raddimlw.h) (1 diff)
• phylmdiso/radepsi_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/phylmdiso/radepsi.h) (1 diff)
• phylmdiso/radopt_mod_h.f90 (moved) (moved from LMDZ6/trunk/libf/phylmdiso/radopt.h) (1 diff)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -365 +365 @@
        USE nuage_params_mod_h
        USE dimpft_mod_h, ONLY: nvm_lmdz
+       USE radepsi_mod_h
+       USE radopt_mod_h
     IMPLICIT NONE
     !>======================================================================
@@ -564 +566 @@
     !
     include "declare_STDlev.h"
-    !
-    !
-    include "radepsi.h"
-    include "radopt.h"
-    !
-    !
+
     INTEGER n
     !ym      INTEGER npoints

LMDZ6/trunk/libf/phylmd/raddimlw_mod_h.f90

@@ -1 @@
-!
-! $Header$
-!
-      INTEGER NUA
-      PARAMETER (NUA=24)
-      INTEGER NTRA
-      PARAMETER (NTRA=15)
-      INTEGER Ninter
-      PARAMETER (Ninter=6)
-      INTEGER NG1, NG1P1
-      PARAMETER (NG1=2, NG1P1=NG1+1)
+MODULE raddimlw_mod_h
+  IMPLICIT NONE; PRIVATE
+  PUBLIC nua, ntra, ninter, ng1, ng1p1
+
+  INTEGER NUA
+  PARAMETER (NUA = 24)
+  INTEGER NTRA
+  PARAMETER (NTRA = 15)
+  INTEGER Ninter
+  PARAMETER (Ninter = 6)
+  INTEGER NG1, NG1P1
+  PARAMETER (NG1 = 2, NG1P1 = NG1 + 1)
+END MODULE raddimlw_mod_h

LMDZ6/trunk/libf/phylmd/radepsi_mod_h.f90

@@ -1 @@
-!
-! $Header$
-!
-      REAL(KIND=8) ZEELOG, ZEPSC, ZEPSCO, ZEPSCQ, ZEPSCT, ZEPSCW
-      REAL(KIND=8) ZEPSEC, ZEPSCR
-      PARAMETER (ZEELOG = 1.E-07) !1.e-10 (not good for 32-bit machines)
-      PARAMETER (ZEPSC  = 1.E-20)
-      PARAMETER (ZEPSCO = 1.E-10)
-      PARAMETER (ZEPSCQ = 1.E-10)
-      PARAMETER (ZEPSCT = 1.E-20)
-      PARAMETER (ZEPSCW = 1.E-20)
-      PARAMETER (ZEPSEC = 1.0E-12)
-      PARAMETER (ZEPSCR = 1.0E-10)
-!
-      REAL(KIND=8) REPSCT
-      PARAMETER (REPSCT=1.0E-10)
+MODULE radepsi_mod_h
+  IMPLICIT NONE; PRIVATE
+  PUBLIC zeelog, zepsc, zepsco, zepscq, zepsct, zepscw, zepsec, zepscr, repsct
+
+  REAL(KIND = 8) ZEELOG, ZEPSC, ZEPSCO, ZEPSCQ, ZEPSCT, ZEPSCW
+  REAL(KIND = 8) ZEPSEC, ZEPSCR
+  PARAMETER (ZEELOG = 1.E-07) !1.e-10 (not good for 32-bit machines)
+  PARAMETER (ZEPSC = 1.E-20)
+  PARAMETER (ZEPSCO = 1.E-10)
+  PARAMETER (ZEPSCQ = 1.E-10)
+  PARAMETER (ZEPSCT = 1.E-20)
+  PARAMETER (ZEPSCW = 1.E-20)
+  PARAMETER (ZEPSEC = 1.0E-12)
+  PARAMETER (ZEPSCR = 1.0E-10)
+
+  REAL(KIND = 8) REPSCT
+  PARAMETER (REPSCT = 1.0E-10)
+END MODULE radepsi_mod_h

LMDZ6/trunk/libf/phylmd/radiation_AR4.f90

@@ -310 +310 @@
 SUBROUTINE swu_lmdar4(psct, pcldsw, ppmb, ppsol, prmu0, pfrac, ptave, pwv, &
     paki, pcld, pclear, pdsig, pfact, prmu, psec, pud)
-  USE clesphys_mod_h
+USE radopt_mod_h
+  USE radepsi_mod_h
+    USE clesphys_mod_h
   USE dimphy
   USE radiation_ar4_param, ONLY: zpdh2o, zpdumg, zprh2o, zprumg, rtdh2o, &
@@ -316 +318 @@
   USE yomcst_mod_h
 IMPLICIT NONE
-  include "radepsi.h"
-  include "radopt.h"
 
 
@@ -699 +699 @@
     palbp, pcg, pcld, pclear, pcldsw, pdsig, pomega, poz, prmu, psec, ptau, &
     pud, pwv, pqs, pfdown, pfup)
-  USE dimphy
+USE radepsi_mod_h
+    USE dimphy
   USE radiation_ar4_param, ONLY: rsun, rray
   USE infotrac_phy, ONLY: type_trac
@@ -706 +707 @@
 
   IMPLICIT NONE
-  include "radepsi.h"
 
   ! ------------------------------------------------------------------
@@ -1195 +1195 @@
     pdsig, prayl, psec, pcgaz, ppizaz, pray1, pray2, prefz, prj, prk, prmu0, &
     ptauaz, ptra1, ptra2)
-  USE dimphy
+USE radopt_mod_h
+  USE radepsi_mod_h
+    USE dimphy
   USE radiation_ar4_param, ONLY: taua, rpiza, rcga
   IMPLICIT NONE
-  include "radepsi.h"
-  include "radopt.h"
 
   ! ------------------------------------------------------------------
@@ -1524 +1524 @@
     ptau, pcgaz, ppizaz, pray1, pray2, prefz, prj, prk, prmue, ptauaz, ptra1, &
     ptra2)
-  USE clesphys_mod_h
+USE radopt_mod_h
+  USE radepsi_mod_h
+    USE clesphys_mod_h
   USE dimphy
   IMPLICIT NONE
-  include "radepsi.h"
-  include "radopt.h"
 
   ! ------------------------------------------------------------------
@@ -2124 +2124 @@
   ! IM  .              ptoplwdown,ptoplwdownclr)
     plwup, plwdn, plwup0, plwdn0)
-  USE dimphy
+USE raddimlw_mod_h
+    USE dimphy
   USE print_control_mod, ONLY: lunout
   USE yomcst_mod_h
 IMPLICIT NONE
-  include "raddimlw.h"
 
 
@@ -2311 +2311 @@
 ! IM ctes ds clesphys.h   SUBROUTINE LWU(RCO2, RCH4, RN2O, RCFC11, RCFC12,
 SUBROUTINE lwu_lmdar4(paer, pdp, ppmb, ppsol, poz, ptave, pview, pwv, pabcu)
-  USE clesphys_mod_h
+USE radopt_mod_h
+  USE radepsi_mod_h
+  USE raddimlw_mod_h
+    USE clesphys_mod_h
   USE dimphy
   USE radiation_ar4_param, ONLY: tref, rt1, raer, at, bt, oct
@@ -2320 +2323 @@
   USE yomcst_mod_h
 IMPLICIT NONE
-  include "raddimlw.h"
-
-  include "radepsi.h"
-  include "radopt.h"
+
 
   ! PURPOSE.
@@ -2680 +2680 @@
 SUBROUTINE lwbv_lmdar4(klim, pdp, pdt0, pemis, ppmb, ptl, ptave, pabcu, &
     pfluc, pbint, pbsui, pcts, pcntrb)
-  USE dimphy
+USE raddimlw_mod_h
+    USE dimphy
   USE yomcst_mod_h
 IMPLICIT NONE
-  include "raddimlw.h"
 
 
@@ -2767 +2767 @@
 SUBROUTINE lwc_lmdar4(klim, pcldld, pcldlu, pemis, pfluc, pbint, pbsuin, &
     pcts, pcntrb, pflux)
-  USE dimphy
+USE radopt_mod_h
+  USE radepsi_mod_h
+    USE dimphy
   IMPLICIT NONE
-  include "radepsi.h"
-  include "radopt.h"
 
   ! PURPOSE.
@@ -3143 +3143 @@
 SUBROUTINE lwb_lmdar4(pdt0, ptave, ptl, pb, pbint, pbsuin, pbsur, pbtop, &
     pdbsl, pga, pgb, pgasur, pgbsur, pgatop, pgbtop)
-  USE dimphy
+USE raddimlw_mod_h
+    USE dimphy
   USE radiation_ar4_param, ONLY: tintp, xp, ga, gb
   IMPLICIT NONE
-  include "raddimlw.h"
 
   ! -----------------------------------------------------------------------
@@ -4543 +4543 @@
     pbtop, pdbsl, pemis, ppmb, ptave, pga, pgb, pgasur, pgbsur, pgatop, &
     pgbtop, pcntrb, pcts, pfluc)
-  USE dimphy
+USE raddimlw_mod_h
+    USE dimphy
   USE yomcst_mod_h
 IMPLICIT NONE
-  include "raddimlw.h"
 
 
@@ -4649 +4649 @@
     pbsui, pbsur, pbtop, pdisd, pdisu, pemis, ppmb, pga, pgb, pgasur, pgbsur, &
     pgatop, pgbtop, pcts, pfluc)
-  USE dimphy
+USE radopt_mod_h
+  USE raddimlw_mod_h
+    USE dimphy
   IMPLICIT NONE
-  include "raddimlw.h"
-  include "radopt.h"
 
   ! -----------------------------------------------------------------------
@@ -4948 +4948 @@
 SUBROUTINE lwvd_lmdar4(kuaer, ktraer, pabcu, pdbdt, pga, pgb, pcntrb, pdisd, &
     pdisu)
-  USE dimphy
+USE raddimlw_mod_h
+    USE dimphy
   IMPLICIT NONE
-  include "raddimlw.h"
 
   ! -----------------------------------------------------------------------
@@ -5180 +5180 @@
 SUBROUTINE lwvn_lmdar4(kuaer, ktraer, pabcu, pdbsl, pga, pgb, padjd, padju, &
     pcntrb, pdbdt)
-  USE dimphy
+USE raddimlw_mod_h
+    USE dimphy
   USE radiation_ar4_param, ONLY: wg1
   IMPLICIT NONE
-  include "raddimlw.h"
 
   ! -----------------------------------------------------------------------
@@ -5373 +5373 @@
 END SUBROUTINE lwvn_lmdar4
 SUBROUTINE lwtt_lmdar4(pga, pgb, puu, ptt)
-  USE dimphy
+USE raddimlw_mod_h
+    USE dimphy
   IMPLICIT NONE
-  include "raddimlw.h"
 
   ! -----------------------------------------------------------------------
@@ -5546 +5546 @@
 END SUBROUTINE lwtt_lmdar4
 SUBROUTINE lwttm_lmdar4(pga, pgb, puu1, puu2, ptt)
-  USE dimphy
+USE raddimlw_mod_h
+    USE dimphy
   IMPLICIT NONE
-  include "raddimlw.h"
 
   ! ------------------------------------------------------------------

LMDZ6/trunk/libf/phylmd/radopt_mod_h.f90

@@ -1 @@
-!
-! $Header$
-!
-      LOGICAL LEVOIGT
-      PARAMETER (LEVOIGT=.FALSE.)
-      INTEGER NOVLP
-      PARAMETER (NOVLP=1)
-      INTEGER KAER
-      PARAMETER (KAER=0)
+MODULE radopt_mod_h
+  IMPLICIT NONE; PRIVATE
+  PUBLIC levoigt, novlp, kaer
+
+  LOGICAL LEVOIGT
+  PARAMETER (LEVOIGT = .FALSE.)
+  INTEGER NOVLP
+  PARAMETER (NOVLP = 1)
+  INTEGER KAER
+  PARAMETER (KAER = 0)
+END MODULE radopt_mod_h

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -438 +438 @@
     USE nuage_params_mod_h
     USE dimpft_mod_h, ONLY: nvm_lmdz
+    USE radepsi_mod_h
+    USE radopt_mod_h
     IMPLICIT NONE
     !>======================================================================
@@ -643 +645 @@
     !
     include "declare_STDlev.h"
-    !
-    !
-    include "radepsi.h"
-    include "radopt.h"
-    !
-    !
+
     INTEGER n
     !ym      INTEGER npoints

LMDZ6/trunk/libf/phylmdiso/raddimlw_mod_h.f90

@@ -1 @@
-link ../phylmd/raddimlw.h
+link ../phylmd/raddimlw_mod_h.f90

LMDZ6/trunk/libf/phylmdiso/radepsi_mod_h.f90

@@ -1 @@
-link ../phylmd/radepsi.h
+link ../phylmd/radepsi_mod_h.f90

LMDZ6/trunk/libf/phylmdiso/radopt_mod_h.f90

@@ -1 @@
-link ../phylmd/radopt.h
+link ../phylmd/radopt_mod_h.f90