Changeset 5090 for LMDZ6/branches/Amaury_dev/libf/dyn3d/gcm.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/dyn3d/gcm.F90 (modified) (2 diffs)

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

@@ -26 +26 @@
   USE logic_mod, ONLY: ecripar, iflag_phys, read_start
 
+  USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
+
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   ! FH 2008/05/09 On elimine toutes les clefs physiques dans la dynamique
   ! A nettoyer. On ne veut qu'une ou deux routines d'interface 
   ! dynamique -> physique pour l'initialisation
-#ifdef CPP_PHYS
+  ! AB 2024/07/20: remplace CPP key by fortran logical, but ^ still relevant, see later use of iniphys later on
   USE iniphysiq_mod, ONLY: iniphysiq
-#endif
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -406 +407 @@
 
   IF ((iflag_phys==1).or.(iflag_phys>=100)) THEN
-     ! Physics:
-#ifdef CPP_PHYS
-     CALL iniphysiq(iim,jjm,llm, &
+    ! Physics:
+    IF (CPPKEY_PHYS) THEN
+      CALL iniphysiq(iim,jjm,llm, &
           (jjm-1)*iim+2,comm_lmdz, &
           daysec,day_ini,dtphys/nsplit_phys, &
           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))