Changeset 3838 for dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd

Timestamp:

Jun 27, 2015, 8:11:14 AM (9 years ago)

Author:

millour

Message:

Fixed call to iniphysiq from gcm and removed unused "pdayref" argument (day_ini is known from temps.h).
Removed "dtime" from phys_state_var_mod.F90; pdtphys (from time_phylmdz_mod) must be used instead.
With this revision seq and parallel MPI/OpenMP bench runs yield identical restart files.
EM

Location:

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd

Files:

• calcul_divers.h (modified) (4 diffs)
• ini_histday_seri.h (modified) (2 diffs)
• ini_paramLMDZ_phy.h (modified) (2 diffs)
• ini_undefSTD.F90 (modified) (2 diffs)
• moy_undefSTD.F90 (modified) (3 diffs)
• phyetat0.F90 (modified) (3 diffs)
• phyredem.F90 (modified) (2 diffs)
• phys_state_var_mod.F90 (modified) (1 diff)
• undefSTD.F90 (modified) (3 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/calcul_divers.h

@@ -20 +20 @@
 
 ! Calcul fin de journee : total_rain, nday_rain
-      IF(MOD(itap,NINT(un_jour/dtime)).EQ.0) THEN
+      IF(MOD(itap,NINT(un_jour/pdtphys)).EQ.0) THEN
 !        print*,'calcul nday_rain itap ',itap
          DO i = 1, klon
@@ -29 +29 @@
 
 ! Initialisation fin de mois
-      IF(MOD(itap-itapm1,NINT(mth_len*un_jour/dtime)).EQ.0) THEN
-        itapm1=itapm1+NINT(mth_len*un_jour/dtime)
+      IF(MOD(itap-itapm1,NINT(mth_len*un_jour/pdtphys)).EQ.0) THEN
+        itapm1=itapm1+NINT(mth_len*un_jour/pdtphys)
 !       print*,'initialisation itapm1 ',itapm1
       ENDIF
@@ -41 +41 @@
      t2m_max_mon=0.
   ENDIF
-  IF(MOD(itap,NINT(un_jour/dtime)).EQ.1) THEN
+  IF(MOD(itap,NINT(un_jour/pdtphys)).EQ.1) THEN
      zt2m_min_mon=zt2m
      zt2m_max_mon=zt2m
@@ -51 +51 @@
      ENDDO
 !fin de journee
-  IF(MOD(itap,NINT(un_jour/dtime)).EQ.0) THEN
+  IF(MOD(itap,NINT(un_jour/pdtphys)).EQ.0) THEN
    t2m_min_mon=t2m_min_mon+zt2m_min_mon 
    t2m_max_mon=t2m_max_mon+zt2m_max_mon 

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ini_histday_seri.h

@@ -7 +7 @@
       IF (type_run.EQ."AMIP") THEN
 !
-       zstophy = dtime
+       zstophy = pdtphys
        zout = ecrit_day
 !
@@ -31 +31 @@
                        nbp_lon,zx_lon(:,1), jjmp1,zx_lat(1,:), &
                        imin_debut,nbpti,jmin_debut,nbptj, &
-                       itau_phy, zjulian, dtime, &
+                       itau_phy, zjulian, pdtphys, &
                        nhori, nid_day_seri)
 !

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ini_paramLMDZ_phy.h

@@ -9 +9 @@
       if (is_mpi_root) then
 !
-       zstophy = dtime
+       zstophy = pdtphys
        zout = mth_len*un_jour
 !
@@ -27 +27 @@
                        np,zx_lon(np:np,1), np,zx_lat(1,np:np), &
                        1,1,1,1, &
-                       itau_phy, zjulian, dtime, &
+                       itau_phy, zjulian, pdtphys, &
                        nhori, nid_ctesGCM)
 !

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ini_undefSTD.F90

@@ -7 +7 @@
   USE phys_state_var_mod ! Variables sauvegardees de la physique
   USE phys_cal_mod, ONLY: mth_len
+  USE time_phylmdz_mod, ONLY: pdtphys
   IMPLICIT NONE
   include "clesphys.h"
@@ -58 +59 @@
 
     IF (n==1 .AND. itap-itapm1==1 .OR. n>1 .AND. mod(itap,nint( &
-        freq_outnmc(n)/dtime))==1) THEN
+        freq_outnmc(n)/pdtphys))==1) THEN
       ! print*,'ini_undefSTD n itap',n,itap
       DO k = 1, nlevstd

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/moy_undefSTD.F90

@@ -7 +7 @@
   USE phys_state_var_mod
   USE phys_cal_mod, ONLY: mth_len
+  USE time_phylmdz_mod, ONLY: pdtphys
   IMPLICIT NONE
   include "clesphys.h"
@@ -67 +68 @@
 
     IF (n==1 .AND. itap==itapm1 .OR. n>1 .AND. mod(itap,nint(freq_outnmc(n)/ &
-        dtime))==0) THEN
+        pdtphys))==0) THEN
 
       ! print*,'moy_undefSTD n itap itapm1',n,itap,itapm1
@@ -132 +133 @@
         END DO !i
       END DO !k
-    END IF !MOD(itap,NINT(freq_outNMC(n)/dtime)).EQ.0
+    END IF !MOD(itap,NINT(freq_outNMC(n)/pdtphys)).EQ.0
 
   END DO !n

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phyetat0.F90

@@ -10 +10 @@
   USE surface_data,     ONLY : type_ocean, version_ocean
   USE geometry_mod,         ONLY : lon_degrees, lat_degrees
-  USE phys_state_var_mod, ONLY : ancien_ok, clwcon, detr_therm, dtime, &
+  USE phys_state_var_mod, ONLY : ancien_ok, clwcon, detr_therm, &
        qsol, fevap, z0m, z0h, agesno, &
        du_gwd_rando, dv_gwd_rando, entr_therm, f0, fm_therm, &
@@ -838 +838 @@
 
   IF ( type_ocean == 'slab' ) THEN
-      CALL ocean_slab_init(dtime, pctsrf)
+      CALL ocean_slab_init(pdtphys, pctsrf)
       found=phyetat0_get(nslay,tslab,"tslab","tslab",0.)
       IF (.NOT. found) THEN 
@@ -876 +876 @@
   ! Initialize module ocean_cpl_mod for the case of coupled ocean
   IF ( type_ocean == 'couple' ) THEN
-     CALL ocean_cpl_init(dtime, lon_degrees, lat_degrees)
+     CALL ocean_cpl_init(pdtphys, lon_degrees, lat_degrees)
   ENDIF
 

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phyredem.F90

@@ -18 +18 @@
   USE surface_data
   USE ocean_slab_mod, ONLY : tslab, seaice, tice, fsic
-  USE time_phylmdz_mod, ONLY: annee_ref, day_end, itau_phy
+  USE time_phylmdz_mod, ONLY: annee_ref, day_end, itau_phy, pdtphys
 
   IMPLICIT none
@@ -69 +69 @@
      tab_cntrl(ierr) = 0.0
   ENDDO
-  tab_cntrl(1) = dtime
+  tab_cntrl(1) = pdtphys
   tab_cntrl(2) = radpas
   ! co2_ppm : current value of atmospheric CO2

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_state_var_mod.F90

@@ -17 +17 @@
       INTEGER, SAVE :: radpas
 !$OMP THREADPRIVATE(radpas)
-      REAL, SAVE :: dtime, solaire_etat0
-!$OMP THREADPRIVATE(dtime, solaire_etat0)
+      REAL, SAVE :: solaire_etat0
+!$OMP THREADPRIVATE(solaire_etat0)
 
       REAL, ALLOCATABLE, SAVE ::  pctsrf(:,:)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/undefSTD.F90

@@ -6 +6 @@
   USE dimphy
   USE phys_state_var_mod ! Variables sauvegardees de la physique
+  USE time_phylmdz_mod, ONLY: pdtphys
   IMPLICIT NONE
   include "clesphys.h"
@@ -57 +58 @@
 
 
-    ! calcul variables tous les freq_calNMC(n)/dtime pas de temps
+    ! calcul variables tous les freq_calNMC(n)/pdtphys pas de temps
     ! de la physique
 
-    IF (mod(itap,nint(freq_calnmc(n)/dtime))==0) THEN
+    IF (mod(itap,nint(freq_calnmc(n)/pdtphys))==0) THEN
       DO k = 1, nlevstd
         DO i = 1, klon
@@ -93 +94 @@
       END DO !k
 
-    END IF !MOD(itap,NINT(freq_calNMC(n)/dtime)).EQ.0
+    END IF !MOD(itap,NINT(freq_calNMC(n)/pdtphys)).EQ.0
 
   END DO !n