Changeset 3892

Timestamp:

Aug 13, 2025, 5:47:08 PM (32 hours ago)

Author:

emillour

Message:

Venus PCM:
Some code cleanup:

• remove clmain.old and clmain.classic
• remove all the unnecessary "EXTERNAL" statements in physiq
• turn hgardfou into a module (and remove obsolete cpp directives for CRAY computers)

EM

Location:

trunk/LMDZ.VENUS/libf/phyvenus

Files:

• clmain.classic (deleted)
• clmain.old (deleted)
• hgardfou.F (modified) (10 diffs)
• phyetat0.F90 (modified) (2 diffs)
• physiq_mod.F (modified) (2 diffs)

trunk/LMDZ.VENUS/libf/phyvenus/hgardfou.F

@@ -1 @@
-!
-! $Header: /home/cvsroot/LMDZ4/libf/phylmd/hgardfou.F,v 1.1.1.1 2004/05/19 12:53:07 lmdzadmin Exp $
-!
+      MODULE hgardfou_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+
       SUBROUTINE hgardfou (t,tsol,text)
 
       use dimphy, only: klon,klev
-      use YOMCST_mod
+
       IMPLICIT none
+
 c======================================================================
-c Check temperature
+c Check that temperatures are in a reasonable range
 c======================================================================
-!#include "YOMCST.h"
+
       REAL,INTENT(IN) :: t(klon,klev), tsol(klon)
       CHARACTER(len=*),INTENT(in):: text
@@ -24 +28 @@
 c
       LOGICAL,SAVE :: firstcall=.TRUE.
+c$OMP THREADPRIVATE(firstcall)
 
       IF (firstcall) THEN
@@ -56 +61 @@
          
          ! Look for temperatures greater than tmax
-#ifdef CRAY
-         CALL WHENFGT(klon, zt, 1, tmax, jadrs, jbad)
-#else
          jbad = 0
          DO i = 1, klon
@@ -66 +68 @@
            ENDIF
          ENDDO
-#endif
+
          IF (jbad .GT. 0) THEN
            ok = .FALSE.
@@ -75 +77 @@
 
          ! Look for temperatures lower than tmin
-#ifdef CRAY
-         CALL WHENFLT(klon, zt, 1, tmin, jadrs, jbad)
-#else
          jbad = 0
          DO i = 1, klon
@@ -85 +84 @@
            ENDIF
          ENDDO
-#endif
+
          IF (jbad .GT. 0) THEN
            ok = .FALSE.
@@ -111 +110 @@
         ok = .FALSE.
         DO i = 1, jbad
-          PRINT *,'i,temperature =',jadrs(i),zt(jadrs(i))
+          PRINT *,'i,tsol =',jadrs(i),zt(jadrs(i))
         ENDDO
       ENDIF
 
       ! Look for temperatures greater then tmax
-#ifdef CRAY
-      CALL WHENFGT(klon, zt, 1, tmax, jadrs, jbad)
-#else
       jbad = 0
       DO i = 1, klon
@@ -126 +122 @@
         ENDIF
       ENDDO
-#endif
+
       IF (jbad .GT. 0) THEN
         ok = .FALSE.
         DO i = 1, jbad
-          PRINT *,'i,temperature =',jadrs(i),zt(jadrs(i))
+          PRINT *,'i,tsol =',jadrs(i),zt(jadrs(i))
         ENDDO
       ENDIF
 
       ! Look for temperatures lower than tmin
-#ifdef CRAY
-      CALL WHENFLT(klon, zt, 1, tmin, jadrs, jbad)
-#else
       jbad = 0
       DO i = 1, klon
@@ -145 +138 @@
         ENDIF
       ENDDO
-#endif
+
       IF (jbad .GT. 0) THEN
         ok = .FALSE.
         DO i = 1, jbad
-          PRINT *,'i,temperature =',jadrs(i),zt(jadrs(i))
+          PRINT *,'i,tsol =',jadrs(i),zt(jadrs(i))
         ENDDO
       ENDIF
@@ -158 +151 @@
       ENDIF
 
-      END
+      END SUBROUTINE hgardfou
+
+      END MODULE hgardfou_mod

trunk/LMDZ.VENUS/libf/phyvenus/phyetat0.F90

@@ -23 +23 @@
   use tabcontrol_mod, only: dtime, radpas, length, tabcntr0
   use soil_mod, only: nsoilmx
-  use clesphys_mod
+  use clesphys_mod, only: startphy_file
 
 implicit none
@@ -102 +102 @@
                  " i=",i," lon_startphy(i)=",lon_startphy(i),&
                  " longitude_deg(i)=",longitude_deg(i)
-      call abort_physic(modname,"<latitude> values discrepency",1)
+      call abort_physic(modname,"<longitude> values discrepency",1)
     ENDIF
   ENDDO

trunk/LMDZ.VENUS/libf/phyvenus/physiq_mod.F

@@ -86 +86 @@
       use tabcontrol_mod, only: radpas, dtime
       use soil_mod, only: nsoilmx
+      use hgardfou_mod, only: hgardfou
       use clesphys_mod
       use YOMCST_mod
@@ -245 +246 @@
       REAL Fsedim(klon,klev+1)  ! Flux de sedimentation (kg.m-2)
 
-c======================================================================
-c
-c Declaration des procedures appelees
-c
-      EXTERNAL ajsec         ! ajustement sec
-      EXTERNAL clmain        ! couche limite 
-      EXTERNAL clmain_ideal  ! couche limite simple 
-      EXTERNAL hgardfou      ! verifier les temperatures
-c     EXTERNAL orbite         ! calculer l'orbite 
-      EXTERNAL phyredem      ! ecrire l'etat de redemarrage de la physique
-      EXTERNAL radlwsw       ! rayonnements solaire et infrarouge
-!      EXTERNAL suphec        ! initialiser certaines constantes
-      EXTERNAL transp        ! transport total de l'eau et de l'energie
-      EXTERNAL printflag
-      EXTERNAL zenang
-      EXTERNAL diagetpq
-      EXTERNAL diagphy
-      EXTERNAL mucorr
-      EXTERNAL nirco2abs
-      EXTERNAL nir_leedat
-      EXTERNAL nltecool
-      EXTERNAL nlte_tcool
-      EXTERNAL nlte_setup
-      EXTERNAL blendrad
-      EXTERNAL nlthermeq
-      EXTERNAL euvheat
-      EXTERNAL param_read_e107
-      EXTERNAL conduction
-      EXTERNAL molvis
-      EXTERNAL moldiff_red
 
 c