Changeset 5103 for LMDZ6/branches/Amaury_dev/libf/phydev

Timestamp:

Jul 23, 2024, 3:29:36 PM (2 months ago)

Author:

abarral

Message:

Handle CPP_INLANDSIS in lmdz_cppkeys_wrapper.F90
Remove obsolete key wrgrads_thermcell, _ADV_HALO, _ADV_HALLO, isminmax
Remove redundant uses of CPPKEY_INCA (thanks acozic)
Remove obsolete misc/write_field.F90
Remove unused ioipsl_* wrappers
Remove calls to WriteField_u with wrong signature
Convert .F -> .[fF]90
(lint) uppercase fortran operators
[note: 1d and iso still broken - working on it]

Location:

LMDZ6/branches/Amaury_dev/libf/phydev

Files:

• iophy.F90 (modified) (8 diffs)
• physiq_mod.F90 (modified) (5 diffs)

LMDZ6/branches/Amaury_dev/libf/phydev/iophy.F90

@@ -25 +25 @@
 contains
 
-  subroutine init_iophy_new(rlat,rlon)
+  SUBROUTINE init_iophy_new(rlat,rlon)
   USE dimphy, only: klon
   USE mod_phys_lmdz_para, only: gather, bcast, &
@@ -34 +34 @@
   USE print_control_mod, ONLY: lunout, prt_level
   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
-#ifdef CPP_IOIPSL
   USE ioipsl, only: flio_dom_set
-#endif
   use wxios, only: wxios_domain_param, using_xios
   implicit none
@@ -141 +139 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   
-  subroutine histbeg_phy(name,itau0,zjulian,dtime,nhori,nid_day)
+  SUBROUTINE histbeg_phy(name,itau0,zjulian,dtime,nhori,nid_day)
   USE mod_phys_lmdz_para, only: is_sequential, jj_begin, jj_end, jj_nb
   use ioipsl, only: histbeg
@@ -165 +163 @@
 !$OMP END MASTER
   
-  end subroutine histbeg_phy
+  END SUBROUTINE  histbeg_phy
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -200 +198 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  
-  subroutine histwrite2d_phy(nid,lpoint,name,itau,field)
+  SUBROUTINE histwrite2d_phy(nid,lpoint,name,itau,field)
   USE dimphy, only: klon
   USE mod_phys_lmdz_para, only: Gather_omp, grid1Dto2D_mpi, &
@@ -242 +240 @@
      else
       DO ip=1, npstn
-!     print*,'histwrite2d is_sequential npstn ip name nptabij',npstn,ip,name,nptabij(ip)
+!     PRINT*,'histwrite2d is_sequential npstn ip name nptabij',npstn,ip,name,nptabij(ip)
        IF(nptabij(ip)>=klon_mpi_begin.AND. &
           nptabij(ip)<=klon_mpi_end) THEN
@@ -255 +253 @@
     deallocate(fieldok)
 !$OMP END MASTER    
-  end subroutine histwrite2d_phy
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-  subroutine histwrite3d_phy(nid,lpoint,name,itau,field)
+  END SUBROUTINE  histwrite2d_phy
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+  SUBROUTINE histwrite3d_phy(nid,lpoint,name,itau,field)
   USE dimphy, only: klon
   USE mod_phys_lmdz_para, only: Gather_omp, grid1Dto2D_mpi, &
@@ -317 +315 @@
   deallocate(fieldok)
 !$OMP END MASTER    
-  end subroutine histwrite3d_phy
+  END SUBROUTINE  histwrite3d_phy
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

LMDZ6/branches/Amaury_dev/libf/phydev/physiq_mod.F90

@@ -56 +56 @@
 real :: temp_newton(klon,klev)
 integer :: k
-logical, save :: first=.true.
+logical, save :: first=.TRUE.
 !$OMP THREADPRIVATE(first)
 
@@ -75 +75 @@
 
 ! initializations
-if (debut) then ! Things to do only for the first CALL to physics
+IF (debut) then ! Things to do only for the first CALL to physics
 ! load initial conditions for physics (including the grid)
   CALL phys_state_var_init() ! some initializations, required before calling phyetat0
@@ -137 +137 @@
 !$OMP END MASTER
 !$OMP BARRIER
-endif ! of if (debut)
+END IF ! of if (debut)
 
 ! increment local time counter itau
@@ -154 +154 @@
 d_v(1:klon,1)=-v(1:klon,1)/86400.
 ! newtonian relaxation towards temp_newton()
-do k=1,klev
+DO k=1,klev
   temp_newton(1:klon,k)=280.+cos(latitude(1:klon))*40.-pphi(1:klon,k)/rg*6.e-3
   d_t(1:klon,k)=(temp_newton(1:klon,k)-t(1:klon,k))/1.e5
-enddo
+END DO
 
 
-print*,'PHYDEV: itau=',itau
+PRINT*,'PHYDEV: itau=',itau
 
 ! write some outputs:
 ! IOIPSL
 #ifndef CPP_IOIPSL_NO_OUTPUT 
-if (modulo(itau,iwrite_phys)==0) then
-  CALL histwrite_phy(nid_hist,.false.,"temperature",itau,t)
-  CALL histwrite_phy(nid_hist,.false.,"u",itau,u)
-  CALL histwrite_phy(nid_hist,.false.,"v",itau,v)
-  CALL histwrite_phy(nid_hist,.false.,"ps",itau,paprs(:,1))
-endif
+IF (modulo(itau,iwrite_phys)==0) then
+  CALL histwrite_phy(nid_hist,.FALSE.,"temperature",itau,t)
+  CALL histwrite_phy(nid_hist,.FALSE.,"u",itau,u)
+  CALL histwrite_phy(nid_hist,.FALSE.,"v",itau,v)
+  CALL histwrite_phy(nid_hist,.FALSE.,"ps",itau,paprs(:,1))
+END IF
 #endif
 
@@ -191 +191 @@
 
 ! if lastcall, then it is time to write "restartphy.nc" file
-if (lafin) then
+IF (lafin) then
   CALL phyredem("restartphy.nc")
-endif
+END IF
 
-end subroutine physiq
+END SUBROUTINE  physiq
 
 END MODULE physiq_mod