Changeset 5117 for LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd

Timestamp:

Jul 24, 2024, 4:23:34 PM (6 months ago)

Author:

abarral

Message:

rename modules properly lmdz_*
move some unused files to obsolete/
(lint) uppercase fortran keywords

Location:

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd

Files:

• callphysiq_mod.F90 (modified) (2 diffs)
• ce0l.F90 (modified) (1 diff)
• etat0dyn_netcdf.F90 (modified) (2 diffs)
• etat0phys_netcdf.F90 (modified) (2 diffs)
• limit_netcdf.f90 (modified) (2 diffs)
• test_disvert_m.F90 (modified) (3 diffs)

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/callphysiq_mod.F90

@@ -69 +69 @@
 
   !$OMP MASTER
-  if (ok_dyn_xios) THEN
+  IF (ok_dyn_xios) THEN
      CALL xios_get_current_context(dyn3d_ctx_handle)
-  endif
+  ENDIF
   !$OMP END MASTER
 
@@ -99 +99 @@
 ! switching back to LMDZDYN context
 !$OMP MASTER
-  if (ok_dyn_xios) THEN
+  IF (ok_dyn_xios) THEN
      CALL xios_set_current_context(dyn3d_ctx_handle)
-  endif
+  ENDIF
 !$OMP END MASTER
 

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/ce0l.F90

@@ -73 +73 @@
 
 #ifdef CPP_PARA
-  integer ierr
+  INTEGER ierr
 #else
 ! for iniphysiq in serial mode

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90

@@ -39 +39 @@
   USE comvert_mod, ONLY: ap, bp, preff, pressure_exner
   USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn, itau_phy, start_time
-  USE strings_mod, ONLY: strLower
+  USE lmdz_strings, ONLY: strLower
 
   IMPLICIT NONE
@@ -78 +78 @@
     USE lmdz_filtreg
     USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA
+    USE lmdz_q_sat, ONLY: q_sat
     IMPLICIT NONE
     !-------------------------------------------------------------------------------

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90

@@ -539 +539 @@
   do j=2,jmp1-1
      PRINT*,'avant if ',cos(rlatu(j)),coslat0
-     if (cos(rlatu(j))<coslat0) THEN
+     IF (cos(rlatu(j))<coslat0) THEN
          ! nb de pts affectes par le filtrage de part et d'autre du pt
          ifiltre=(coslat0/cos(rlatu(j))-1.)/2.
@@ -548 +548 @@
          wwf(ifiltre+1)=(coslat0/cos(rlatu(j))-1.)/2.-ifiltre
          do i=1,imp1-1
-            if (masque(i,j)>0.9) THEN
+            IF (masque(i,j)>0.9) THEN
                ssz=phis(i,j)
                do ifi=1,ifiltre+1
                   ii=i+ifi
-                  if (ii>imp1-1) ii=ii-imp1+1
+                  IF (ii>imp1-1) ii=ii-imp1+1
                   ssz=ssz+wwf(ifi)*phis(ii,j)
                   ii=i-ifi
-                  if (ii<1) ii=ii+imp1-1
+                  IF (ii<1) ii=ii+imp1-1
                   ssz=ssz+wwf(ifi)*phis(ii,j)
                enddo

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/limit_netcdf.f90

@@ -378 +378 @@
       REAL :: chmin, chmax, timeday, al
       INTEGER ierr, idx
-      integer n_extrap ! number of extrapolated points
-      logical skip
+      INTEGER n_extrap ! number of extrapolated points
+      LOGICAL skip
 
       !------------------------------------------------------------------------------
@@ -599 +599 @@
             CALL pchfe_95(timeyear, champtime(i, j, :), yder, skip, &
                     arth(0.5, real(ndays_in) / ndays, ndays), champan(i, j, :), ierr)
-            if (ierr < 0) CALL abort_physic("get_2Dfield", "", 1)
+            IF (ierr < 0) CALL abort_physic("get_2Dfield", "", 1)
             n_extrap = n_extrap + ierr
           END DO

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/test_disvert_m.F90

@@ -13 +13 @@
     ! the surface pressure, which sample possible values on Earth.
 
-    use exner_hyb_m, ONLY: exner_hyb
-    use lmdz_vertical_layers, ONLY: ap,bp,preff
-    use comconst_mod, ONLY: kappa, cpp
+    USE exner_hyb_m, ONLY: exner_hyb
+    USE lmdz_vertical_layers, ONLY: ap,bp,preff
+    USE comconst_mod, ONLY: kappa, cpp
     USE lmdz_abort_physic, ONLY: abort_physic
 
@@ -22 +22 @@
 
     ! Local:
-    integer l, i
-    integer, parameter:: ngrid = 7
-    real p(ngrid, llm + 1) ! pressure at half-level, in Pa
-    real pks(ngrid) ! exner function at the surface, in J K-1 kg-1 
-    real pk(ngrid, llm) ! exner function at full level, in J K-1 kg-1 
-    real ps(ngrid) ! surface pressure, in Pa
-    real p_lay(ngrid, llm) ! pressure at full level, in Pa
-    real delta_ps ! in Pa
+    INTEGER l, i
+    INTEGER, parameter:: ngrid = 7
+    REAL p(ngrid, llm + 1) ! pressure at half-level, in Pa
+    REAL pks(ngrid) ! exner function at the surface, in J K-1 kg-1
+    REAL pk(ngrid, llm) ! exner function at full level, in J K-1 kg-1
+    REAL ps(ngrid) ! surface pressure, in Pa
+    REAL p_lay(ngrid, llm) ! pressure at full level, in Pa
+    REAL delta_ps ! in Pa
 
     !---------------------
@@ -42 +42 @@
 
     ! Are pressure values in the right order?
-    if (any(p(:, :llm) <= p_lay .or. p_lay <= p(:, 2:))) THEN
+    IF (any(p(:, :llm) <= p_lay .OR. p_lay <= p(:, 2:))) THEN
        ! List details and stop:
        do l = 1, llm
           do i = 1, ngrid
-             if (p(i, l) <= p_lay(i, l)) THEN
+             IF (p(i, l) <= p_lay(i, l)) THEN
                 print 1000, "ps = ", ps(i) / 100., "hPa, p(level ",  l, &
                      ") = ", p(i, l) / 100., " hPa <= p(layer ", l, ") = ", &
                      p_lay(i, l) / 100., " hPa"
              end if
-             if (p_lay(i, l) <= p(i, l + 1)) THEN
+             IF (p_lay(i, l) <= p(i, l + 1)) THEN
                 print 1000, "ps = ", ps(i) / 100., "hPa, p(layer ", l, ") = ", &
                      p_lay(i, l) / 100., " hPa <= p(level ", l + 1, ") = ", &