Changeset 3822 for dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3d/gcm.F90

Timestamp:

Apr 30, 2015, 3:22:39 PM (10 years ago)

Author:

millour

Message:

A couple of bug fixes.
Now the bench (in debug mode) yields identical results in seq/mpi/omp/mpi_omp, and also identical restart files to rev 5 (ie before any modifications to LMDZ5 source files).
EM

File:

• dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3d/gcm.F90 (modified) (3 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3d/gcm.F90

@@ -99 +99 @@
   REAL, ALLOCATABLE, DIMENSION(:,:,:):: q! champs advectes
   REAL ps(ip1jmp1)                       ! pression  au sol
-  REAL p (ip1jmp1,llmp1  )               ! pression aux interfac.des couches
+!  REAL p (ip1jmp1,llmp1  )               ! pression aux interfac.des couches
   REAL masse(ip1jmp1,llm)                ! masse d'air
   REAL phis(ip1jmp1)                     ! geopotentiel au sol
-  REAL phi(ip1jmp1,llm)                  ! geopotentiel
-  REAL w(ip1jmp1,llm)                    ! vitesse verticale
+!  REAL phi(ip1jmp1,llm)                  ! geopotentiel
+!  REAL w(ip1jmp1,llm)                    ! vitesse verticale
 
   ! variables dynamiques intermediaire pour le transport
@@ -410 +410 @@
        tetagdiv, tetagrot , tetatemp, vert_prof_dissip)
 
-  !-----------------------------------------------------------------------
-  !   Initialisation de la physique :
-  !   -------------------------------
-
-  IF ((iflag_phys==1).or.(iflag_phys>=100)) THEN
-     ! Physics:
-#ifdef CPP_PHYS
-     CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys/nsplit_phys, &
-          rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
-          iflag_phys)
-#endif
-  ENDIF ! of IF ((iflag_phys==1).or.(iflag_phys>=100))
-
   !  numero de stockage pour les fichiers de redemarrage:
 
@@ -446 +433 @@
 302 FORMAT('1'/,15x,'    au ', i2,'/',i2,'/',i4)
 #endif
+
+  !-----------------------------------------------------------------------
+  !   Initialisation de la physique :
+  !   -------------------------------
+
+  IF ((iflag_phys==1).or.(iflag_phys>=100)) THEN
+     ! Physics:
+#ifdef CPP_PHYS
+     CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys/nsplit_phys, &
+          rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
+          iflag_phys)
+#endif
+  ENDIF ! of IF ((iflag_phys==1).or.(iflag_phys>=100))
 
   !      if (planet_type.eq."earth") then