Changeset 2239 for LMDZ5/trunk/libf/dynlmdz_phylmd

Timestamp:

Mar 23, 2015, 8:27:30 AM (10 years ago)

Author:

Ehouarn Millour

Message:

Reorganizing physics/dynamics interface:

• what is related to dynamics-physics interface is now in a seperate directory: dynlmdz_phy* for physics in phy*
• 1d model and related dependencies (including a couple from "dynamics", set up as symbolic links) is now in subdirectory "dyn1d" of phy*.
• "bibio" directory is now "misc" and should only contain autonomous utilities.
• "cosp" is now a subdirectory of phylmd.

EM

Location:

LMDZ5/trunk/libf/dynlmdz_phylmd

Files:

• . (added)
• calfis.F (moved) (moved from LMDZ5/trunk/libf/dyn3d/calfis.F)
• calfis_loc.F (moved) (moved from LMDZ5/trunk/libf/dyn3dmem/calfis_loc.F) (2 diffs)
• calfis_p.F (moved) (moved from LMDZ5/trunk/libf/dyn3dpar/calfis_p.F) (3 diffs)
• ce0l.F90 (moved) (moved from LMDZ5/trunk/libf/dyn3d/ce0l.F90)
• gr_dyn_fi.F (moved) (moved from LMDZ5/trunk/libf/dyn3d_common/gr_dyn_fi.F)
• gr_dyn_fi_p.F (moved) (moved from LMDZ5/trunk/libf/dyn3dpar/gr_dyn_fi_p.F) (2 diffs)
• gr_fi_dyn.F (moved) (moved from LMDZ5/trunk/libf/dyn3d_common/gr_fi_dyn.F)
• gr_fi_dyn_p.F (moved) (moved from LMDZ5/trunk/libf/dyn3dpar/gr_fi_dyn_p.F) (2 diffs)
• iniphysiq.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/iniphysiq.F90) (5 diffs)
• mod_grid_phy_lmdz.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/mod_grid_phy_lmdz.F90)
• mod_interface_dyn_phys.F90 (moved) (moved from LMDZ5/trunk/libf/dyn3dpar/mod_interface_dyn_phys.F90) (2 diffs)
• mod_phys_lmdz_mpi_data.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/mod_phys_lmdz_mpi_data.F90)
• mod_phys_lmdz_mpi_transfert.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/mod_phys_lmdz_mpi_transfert.F90)
• mod_phys_lmdz_omp_data.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/mod_phys_lmdz_omp_data.F90)
• mod_phys_lmdz_omp_transfert.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/mod_phys_lmdz_omp_transfert.F90)
• mod_phys_lmdz_para.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/mod_phys_lmdz_para.F90)
• mod_phys_lmdz_transfert_para.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/mod_phys_lmdz_transfert_para.F90)

LMDZ5/trunk/libf/dynlmdz_phylmd/calfis_loc.F

@@ -36 +36 @@
       USE IOPHY
 #endif
+#ifdef CPP_PARA
       USE parallel_lmdz,ONLY:omp_chunk,using_mpi,jjb_u,jje_u,jjb_v,jje_v
       USE Write_Field
       Use Write_field_p
       USE Times
+#endif
       USE infotrac, ONLY: nqtot, niadv, tname
       USE control_mod, ONLY: planet_type, nsplit_phys
 
+#ifdef CPP_PARA
       IMPLICIT NONE
 c=======================================================================
@@ -1186 +1189 @@
 #endif 
 ! of #ifdef CPP_PHYS
-      RETURN
+#endif
+! of #ifdef CPP_PARA
       END

LMDZ5/trunk/libf/dynlmdz_phylmd/calfis_p.F

@@ -33 +33 @@
       USE IOPHY
 #endif
+#ifdef CPP_PARA
       USE parallel_lmdz, ONLY : omp_chunk, using_mpi
       USE Write_Field
       Use Write_field_p
       USE Times
+#endif
       USE infotrac, ONLY: nqtot, niadv, tname
       USE control_mod, ONLY: planet_type, nsplit_phys
@@ -140 +142 @@
       REAL,INTENT(OUT) :: pdpsfi(iip1,jjp1) ! tendency on surface pressure (Pa/s)
 
+#ifdef CPP_PARA
 #ifdef CPP_PHYS
 ! Ehouarn: for now calfis_p needs some informations from physics to compile
@@ -1114 +1117 @@
 #endif 
 ! of #ifdef CPP_PHYS
-      RETURN
+#endif
+! of #ifdef CPP_PARA
       END

LMDZ5/trunk/libf/dynlmdz_phylmd/gr_dyn_fi_p.F

@@ -3 +3 @@
 !
       SUBROUTINE gr_dyn_fi_p(nfield,im,jm,ngrid,pdyn,pfi)
-#ifdef CPP_PHYS
+#ifdef CPP_PARA
 ! Interface with parallel physics,
       USE mod_interface_dyn_phys
@@ -40 +40 @@
 c$OMP END DO NOWAIT
 #endif
-! of #ifdef CPP_PHYS
+! of #ifdef CPP_PARA
       RETURN
       END

LMDZ5/trunk/libf/dynlmdz_phylmd/gr_fi_dyn_p.F

@@ -3 +3 @@
 !
       SUBROUTINE gr_fi_dyn_p(nfield,ngrid,im,jm,pfi,pdyn)
-#ifdef CPP_PHYS
+#ifdef CPP_PARA
 ! Interface with parallel physics,
       USE mod_interface_dyn_phys
@@ -52 +52 @@
 c$OMP END DO NOWAIT
 #endif
-! of #ifdef CPP_PHYS
+! of #ifdef CPP_PARA
       RETURN
       END

LMDZ5/trunk/libf/dynlmdz_phylmd/iniphysiq.F90

@@ -148 +148 @@
     WRITE (lunout, *) '  in the dynamics punjours=', punjours
     WRITE (lunout, *) '   but in the physics RDAY=', rday
-    IF (abs(rday-punjours)>0.01) THEN
+    IF (abs(rday-punjours)>0.01*punjours) THEN
         ! stop here if the relative difference is more than 1%
       abort_message = 'length of day discrepancy'
@@ -158 +158 @@
     WRITE (lunout, *) '     in the dynamics pg=', pg
     WRITE (lunout, *) '  but in the physics RG=', rg
-    IF (abs(rg-pg)>0.01) THEN
+    IF (abs(rg-pg)>0.01*pg) THEN
         ! stop here if the relative difference is more than 1%
       abort_message = 'gravity discrepancy'
@@ -168 +168 @@
     WRITE (lunout, *) '   in the dynamics prad=', prad
     WRITE (lunout, *) '  but in the physics RA=', ra
-    IF (abs(ra-prad)>0.01) THEN
+    IF (abs(ra-prad)>0.01*prad) THEN
         ! stop here if the relative difference is more than 1%
       abort_message = 'planet radius discrepancy'
@@ -178 +178 @@
     WRITE (lunout, *) '     in the dynamics pr=', pr
     WRITE (lunout, *) '  but in the physics RD=', rd
-    IF (abs(rd-pr)>0.01) THEN
+    IF (abs(rd-pr)>0.01*pr) THEN
         ! stop here if the relative difference is more than 1%
       abort_message = 'reduced gas constant discrepancy'
@@ -188 +188 @@
     WRITE (lunout, *) '     in the dynamics pcpp=', pcpp
     WRITE (lunout, *) '  but in the physics RCPD=', rcpd
-    IF (abs(rcpd-pcpp)>0.01) THEN
+    IF (abs(rcpd-pcpp)>0.01*pcpp) THEN
         ! stop here if the relative difference is more than 1%
       abort_message = 'specific heat discrepancy'

LMDZ5/trunk/libf/dynlmdz_phylmd/mod_interface_dyn_phys.F90

@@ -7 +7 @@
   
   
-#ifdef CPP_PHYS
+#ifdef CPP_PARA
 ! Interface with parallel physics,
 CONTAINS
@@ -55 +55 @@
   END SUBROUTINE Init_interface_dyn_phys 
 #endif
-! of #ifdef CPP_PHYS
+! of #ifdef CPP_PARA
 END MODULE mod_interface_dyn_phys