Changeset 5090 for LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/lmdz_calfis_loc.F90

Timestamp:

Jul 20, 2024, 6:08:57 PM (2 months ago)

Author:

abarral

Message:

Move lmdz_netcdf_format.F90 -> lmdz_cppkeys_wrapper.F90 to handle other CPP keys
Replace all (except wrapper) use of CPP_PHYS by fortran logical

File:

• LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/lmdz_calfis_loc.F90 (modified) (10 diffs)

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/lmdz_calfis_loc.F90

@@ -28 +28 @@
           pdqfi, &
           pdpsfi)
-#ifdef CPP_PHYS
-    ! If using physics
-    !
-    !    Auteur :  P. Le Van, F. Hourdin
-    !   .........
+
     USE dimphy
     USE mod_phys_lmdz_mpi_data, mpi_root_xx=>mpi_master
@@ -39 +35 @@
     USE mod_interface_dyn_phys
     USE IOPHY
-#endif
+
     USE lmdz_mpi
 
@@ -49 +45 @@
     USE infotrac, ONLY : nqtot, tracers
     USE control_mod, ONLY : planet_type, nsplit_phys
-#ifdef CPP_PHYS
     USE callphysiq_mod, ONLY: call_physiq
-#endif
+    USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
+
     USE comvert_mod, ONLY : preff, presnivs
     USE comconst_mod, ONLY : cpp, daysec, dtphys, dtvr, kappa, pi
@@ -146 +142 @@
     REAL, INTENT(OUT) :: pdpsfi(iip1, jjb_u:jje_u) ! tendency on surface pressure (Pa/s)
 
-#ifdef CPP_PHYS
+
   ! Ehouarn: for now calfis_p needs some informations from physics to compile
   !    Local variables :
@@ -237 +233 @@
   INTEGER :: jjb,jje
 
+    IF (CPPKEY_PHYS) THEN
+
   !
   !-----------------------------------------------------------------------
@@ -249 +247 @@
   IF ( firstcal )  THEN
     debut = .TRUE.
-    IF (ngridmx.NE.2+(jjm-1)*iim) THEN
+    IF (ngridmx/=2+(jjm-1)*iim) THEN
       write(lunout,*) 'STOP dans calfis'
       write(lunout,*) &
@@ -719 +717 @@
   zdqfic_omp(:,:,:)=0.
 
-#ifdef CPP_PHYS
   do isplit=1,nsplit_phys
 
@@ -750 +747 @@
   enddo
 
-#endif
-  ! of #ifdef CPP_PHYS
-
 
   zdufi_omp(:,:)=zdufic_omp(:,:)/nsplit_phys
@@ -847 +841 @@
 
   klon=klon_mpi
-500   CONTINUE
 !$OMP BARRIER
 
@@ -1204 +1197 @@
   !-----------------------------------------------------------------------
 
-700   CONTINUE
-
   firstcal = .FALSE.
-#endif
-  ! of #ifdef CPP_PHYS
+END IF
   END SUBROUTINE calfis_loc