Changeset 5090 for LMDZ6/branches/Amaury_dev/libf/dyn3dmem

Timestamp:

Jul 20, 2024, 6:08:57 PM (7 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

Location:

LMDZ6/branches/Amaury_dev/libf/dyn3dmem

Files:

• bands.F90 (modified) (3 diffs)
• dynredem_mod.F90 (modified) (1 diff)
• gcm.F90 (modified) (3 diffs)
• lmdz_call_calfis.F90 (modified) (2 diffs)

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/bands.F90

@@ -381 +381 @@
     subroutine AdjustBands_physic
       use times
-#ifdef CPP_PHYS
-! Ehouarn: what follows is only related to // physics
+
+      ! Ehouarn: what follows is only related to // physics
+      USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
       USE mod_phys_lmdz_para, only : klon_mpi_para_nb
-#endif
+
       USE parallel_lmdz
       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))
@@ -431 +432 @@
         distrib_phys(i)=klon_mpi_para_nb(i)+inc(i)
       enddo
-#endif  
+     END IF
          
     end subroutine AdjustBands_physic

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynredem_mod.F90

@@ -6 +6 @@
   USE netcdf, ONLY: nf90_strerror,nf90_noerr,nf90_redef,nf90_put_var,nf90_inquire_dimension,&
           nf90_inq_varid,nf90_get_var,nf90_def_var,nf90_enddef,nf90_put_att
-  USE lmdz_netcdf_format, ONLY: nf90_format
+  USE lmdz_cppkeys_wrapper, ONLY: nf90_format
   PRIVATE
   PUBLIC :: dynredem_write_u, dynredem_write_v, dynredem_read_u, err

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/gcm.F90

@@ -12 +12 @@
   USE parallel_lmdz
   USE infotrac, ONLY: nqtot, init_infotrac
-!#ifdef CPP_PHYS
-!  USE mod_interface_dyn_phys, ONLY: init_interface_dyn_phys
-!#endif
   USE mod_hallo
   USE Bands
@@ -20 +17 @@
   USE control_mod
 
-#ifdef CPP_PHYS
+
   USE iniphysiq_mod, ONLY: iniphysiq
-#endif
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
+
   USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
   USE logic_mod ! all of it, because of copyin clause when calling leapfrog
@@ -415 +413 @@
   IF ((iflag_phys==1).or.(iflag_phys>=100)) THEN
      ! Physics:
-#ifdef CPP_PHYS
-     CALL iniphysiq(iim,jjm,llm, &
-          distrib_phys(mpi_rank),comm_lmdz, &
-          daysec,day_ini,dtphys/nsplit_phys, &
-          rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
-          iflag_phys)
-#endif
+    IF (CPPKEY_PHYS) THEN
+      CALL iniphysiq(iim,jjm,llm, &
+            distrib_phys(mpi_rank),comm_lmdz, &
+            daysec,day_ini,dtphys/nsplit_phys, &
+            rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
+            iflag_phys)
+    END IF
   ENDIF ! of IF ((iflag_phys==1).or.(iflag_phys>=100))
 

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/lmdz_call_calfis.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
-#ifdef CPP_PHYS
   USE lmdz_calfis_loc
-#endif
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
 
   IMPLICIT NONE
@@ -233 +232 @@
   !$OMP BARRIER
 
-#ifdef CPP_PHYS
-    CALL calfis_loc(lafin ,jD_cur, jH_cur,                       &
+    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