Changeset 5250 for LMDZ6/trunk/libf/dyn3dmem

Timestamp:

Oct 22, 2024, 11:55:35 AM (13 months ago)

Author:

abarral

Message:

Wrap uses of cpp key CPP_PHYS

Location:

LMDZ6/trunk/libf/dyn3dmem

Files:

• bands.F90 (modified) (4 diffs)
• call_calfis_mod.F90 (modified) (2 diffs)
• gcm.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/dyn3dmem/bands.F90

@@ -381 +381 @@
     subroutine AdjustBands_physic
       use times
-#ifdef CPP_PHYS
 ! Ehouarn: what follows is only related to // physics
       USE mod_phys_lmdz_para, only : klon_mpi_para_nb
-#endif
+
       USE parallel_lmdz
+      USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
+
       implicit none
 
@@ -408 +409 @@
       medium=medium/mpi_size      
       NbTot=0
-#ifdef CPP_PHYS
+IF (CPPKEY_PHYS) THEN
       do i=0,mpi_size-1
         Inc(i)=nint(klon_mpi_para_nb(i)*(medium-value(i))/value(i))
-        NbTot=NbTot+Inc(i)  
-      enddo
-      
+        NbTot=NbTot+Inc(i)
+      enddo
+
       if (NbTot>=0) then
         Sgn=1
@@ -420 +421 @@
         NbTot=-NbTot
       endif
-      
+
       Index=0
       do i=1,NbTot
@@ -427 +428 @@
         if (Index>mpi_size-1) Index=0
       enddo
-      
+
       do i=0,mpi_size-1
         distrib_phys(i)=klon_mpi_para_nb(i)+inc(i)
       enddo
-#endif  
+END IF
          
     end subroutine AdjustBands_physic

LMDZ6/trunk/libf/dyn3dmem/call_calfis_mod.F90

@@ -88 +88 @@
   USE comvert_mod, ONLY: ap, bp, pressure_exner
   USE temps_mod, ONLY: day_ini, day_ref, jd_ref, jh_ref, start_time
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
+
   
   IMPLICIT NONE
@@ -230 +232 @@
   !$OMP BARRIER
 
-#ifdef CPP_PHYS
+IF (CPPKEY_PHYS) THEN
     CALL calfis_loc(lafin ,jD_cur, jH_cur,                       &
                      ucov,vcov,teta,q,masse,ps,p,pk,phis,phi ,   &
                      du,dv,dteta,dq,                             &
                      flxw, dufi,dvfi,dtetafi,dqfi,dpfi  )
-#endif
+END IF
     ijb=ij_begin
     ije=ij_end  

LMDZ6/trunk/libf/dyn3dmem/gcm.F90

@@ -20 +20 @@
   USE control_mod
 
-#ifdef CPP_PHYS
   USE iniphysiq_mod, ONLY: iniphysiq
-#endif
   USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
   USE logic_mod ! all of it, because of copyin clause when calling leapfrog
@@ -29 +27 @@
                        dt,hour_ini,itaufin
   USE mod_xios_dyn3dmem, ONLY: xios_dyn3dmem_init
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
+
 
   IMPLICIT NONE
@@ -415 +415 @@
   IF ((iflag_phys==1).or.(iflag_phys>=100)) THEN
      ! Physics:
-#ifdef CPP_PHYS
+IF (CPPKEY_PHYS) THEN
      CALL iniphysiq(iim,jjm,llm, &
           distrib_phys(mpi_rank),comm_lmdz, &
@@ -421 +421 @@
           rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
           iflag_phys)
-#endif
+END IF
   ENDIF ! of IF ((iflag_phys==1).or.(iflag_phys>=100))