Changeset 2160 for LMDZ5/branches/testing/libf/dyn3dpar

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dpar/abort_gcm.F (modified) (2 diffs)
• libf/dyn3dpar/conf_gcm.F (deleted)
• libf/dyn3dpar/conf_gcm.F90 (copied) (copied from LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F90)
• libf/dyn3dpar/gcm.F (modified) (1 diff)
• libf/dyn3dpar/getparam.F90 (modified) (1 diff)
• libf/dyn3dpar/guide_p_mod.F90 (modified) (8 diffs)
• libf/dyn3dpar/iniacademic.F90 (modified) (4 diffs)
• libf/dyn3dpar/integrd_p.F (modified) (2 diffs)
• libf/dyn3dpar/leapfrog_p.F (modified) (1 diff)

LMDZ5/branches/testing/libf/dyn3dpar/abort_gcm.F

@@ -27 +27 @@
 C         ierr    = severity of situation ( = 0 normal )
 
-      character(len=*) modname
+      character(len=*), intent(in):: modname
       integer ierr, ierror_mpi
-      character(len=*) message
+      character(len=*), intent(in):: message
 
       write(lunout,*) 'in abort_gcm'
@@ -53 +53 @@
         write(lunout,*) 'Everything is cool'
       else
-        write(lunout,*) 'Houston, we have a problem ', ierr
+        write(lunout,*) 'Houston, we have a problem, ierr = ', ierr
 #ifdef CPP_MPI
 C$OMP CRITICAL (MPI_ABORT_GCM)

LMDZ5/branches/testing/libf/dyn3dpar/gcm.F

@@ -175 +175 @@
 !#ifdef CPP_IOIPSL
       CALL conf_gcm( 99, .TRUE. , clesphy0 )
+      if (mod(iphysiq, iperiod) /= 0) call abort_gcm("conf_gcm",
+     s "iphysiq must be a multiple of iperiod", 1)
 !#else
 !      CALL defrun( 99, .TRUE. , clesphy0 )

LMDZ5/branches/testing/libf/dyn3dpar/getparam.F90

@@ -11 +11 @@
 
    INTERFACE getpar
-     MODULE PROCEDURE ini_getparam,fin_getparam,getparamr,getparami,getparaml
+     MODULE PROCEDURE getparamr,getparami,getparaml
    END INTERFACE
+   private getparamr,getparami,getparaml
 
    INTEGER, PARAMETER :: out_eff=99

LMDZ5/branches/testing/libf/dyn3dpar/guide_p_mod.F90

@@ -67 +67 @@
 
   SUBROUTINE guide_init
-    
+
     USE control_mod
+
     IMPLICIT NONE
   
@@ -74 +75 @@
     INCLUDE "paramet.h"
     INCLUDE "netcdf.inc"
+
+    ! For grossismx:
+    include "serre.h"
 
     INTEGER                :: error,ncidpl,rid,rcod
@@ -93 +97 @@
     CALL getpar('guide_add',.false.,guide_add,'for�age constant?')
     CALL getpar('guide_zon',.false.,guide_zon,'guidage moy zonale')
+    if (guide_zon .and. abs(grossismx - 1.) > 0.01) &
+         call abort_gcm("guide_init", &
+         "zonal nudging requires grid regular in longitude", 1)
 
 !   Constantes de rappel. Unite : fraction de jour
@@ -113 +120 @@
     ! frequences f>0: fx/jour; f<0: tous les f jours; f=0: 1 seule fois.
     IF (iguide_sav.GT.0) THEN
-        iguide_sav=day_step/iguide_sav
+       iguide_sav=day_step/iguide_sav
+    ELSE if (iguide_sav == 0) then
+       iguide_sav = huge(0)
     ELSE
-        iguide_sav=day_step*iguide_sav
+       iguide_sav=day_step*iguide_sav
     ENDIF
 
@@ -155 +164 @@
     ncidpl=-99
     if (guide_plevs.EQ.1) then
-       if (ncidpl.eq.-99) then 
+       if (ncidpl.eq.-99) then
           rcod=nf90_open('apbp.nc',Nf90_NOWRITe, ncidpl)
           if (rcod.NE.NF_NOERR) THEN
@@ -163 +172 @@
        endif
     elseif (guide_plevs.EQ.2) then
-       if (ncidpl.EQ.-99) then 
+       if (ncidpl.EQ.-99) then
           rcod=nf90_open('P.nc',Nf90_NOWRITe,ncidpl)
           if (rcod.NE.NF_NOERR) THEN
@@ -374 +383 @@
     ENDIF
       
-     PRINT *,'---> on rentre dans guide_main'
 !    CALL AllGather_Field(ucov,ip1jmp1,llm)
 !    CALL AllGather_Field(vcov,ip1jm,llm)
@@ -1250 +1258 @@
         enddo
     ENDIF ! guide_reg
+
+    if (.not. guide_add) alpha = 1. - exp(- alpha)
 
   END SUBROUTINE tau2alpha

LMDZ5/branches/testing/libf/dyn3dpar/iniacademic.F90

@@ -4 +4 @@
 SUBROUTINE iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
 
-  use exner_hyb_m, only: exner_hyb
-  use exner_milieu_m, only: exner_milieu
-  USE filtreg_mod
+  USE filtreg_mod, ONLY: inifilr
   USE infotrac, ONLY : nqtot
   USE control_mod, ONLY: day_step,planet_type
 #ifdef CPP_IOIPSL
-  USE IOIPSL
+  USE IOIPSL, ONLY: getin
 #else
   ! if not using IOIPSL, we still need to use (a local version of) getin
-  USE ioipsl_getincom
+  USE ioipsl_getincom, ONLY: getin
 #endif
   USE Write_Field
+  use exner_hyb_m, only: exner_hyb
+  use exner_milieu_m, only: exner_milieu
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -40 +40 @@
   !   ----------
 
-  real time_0
-
-  !   variables dynamiques
-  REAL vcov(ip1jm,llm),ucov(ip1jmp1,llm) ! vents covariants
-  REAL teta(ip1jmp1,llm)                 ! temperature potentielle
-  REAL q(ip1jmp1,llm,nqtot)               ! champs advectes
-  REAL ps(ip1jmp1)                       ! pression  au sol
-  REAL masse(ip1jmp1,llm)                ! masse d'air
-  REAL phis(ip1jmp1)                     ! geopotentiel au sol
+  REAL,INTENT(OUT) :: time_0
+
+  !   fields
+  REAL,INTENT(OUT) :: vcov(ip1jm,llm) ! meridional covariant wind
+  REAL,INTENT(OUT) :: ucov(ip1jmp1,llm) ! zonal covariant wind
+  REAL,INTENT(OUT) :: teta(ip1jmp1,llm) ! potential temperature (K)
+  REAL,INTENT(OUT) :: q(ip1jmp1,llm,nqtot) ! advected tracers (.../kg_of_air)
+  REAL,INTENT(OUT) :: ps(ip1jmp1) ! surface pressure (Pa)
+  REAL,INTENT(OUT) :: masse(ip1jmp1,llm) ! air mass in grid cell (kg)
+  REAL,INTENT(OUT) :: phis(ip1jmp1) ! surface geopotential
 
   !   Local:
@@ -76 +77 @@
   character(len=80) :: abort_message
 
+
+  ! Sanity check: verify that options selected by user are not incompatible
+  if ((iflag_phys==1).and. .not. read_start) then
+    write(lunout,*) trim(modname)," error: if read_start is set to ", &
+    " false then iflag_phys should not be 1"
+    write(lunout,*) "You most likely want an aquaplanet initialisation", &
+    " (iflag_phys >= 100)"
+    call abort_gcm(modname,"incompatible iflag_phys==1 and read_start==.false.",1)
+  endif
+  
   !-----------------------------------------------------------------------
   ! 1. Initializations for Earth-like case
@@ -224 +235 @@
         CALL pression ( ip1jmp1, ap, bp, ps, p       )
         if (pressure_exner) then
-          CALL exner_hyb( ip1jmp1, ps, p, pks, pk )
+          CALL exner_hyb( ip1jmp1, ps, p, pks, pk)
         else
           call exner_milieu(ip1jmp1,ps,p,pks,pk)

LMDZ5/branches/testing/libf/dyn3dpar/integrd_p.F

@@ -137 +137 @@
        
         IF( .NOT. checksum ) THEN
-         write(lunout,*) "integrd: negative surface pressure ",
-     &                                                ps(stop_it)
+           write(lunout,*) "integrd: ps = ", ps(stop_it)
          write(lunout,*) " at node ij =", stop_it
          ! since ij=j+(i-1)*jjp1 , we have
@@ -145 +144 @@
          write(lunout,*) " lon = ",rlonv(i)*180./pi, " deg",
      &                   " lat = ",rlatu(j)*180./pi, " deg"
+         call abort_gcm("integrd_p", "negative surface pressure", 1)
         ENDIF
 

LMDZ5/branches/testing/libf/dyn3dpar/leapfrog_p.F

@@ -717 +717 @@
            CALL exner_milieu_p( ip1jmp1, ps, p, pks, pk, pkf )
          endif
+c$OMP BARRIER
 ! Appel a geopot ajoute le 2014/05/08 pour garantir la convergence numerique
 ! avec dyn3dmem
-      CALL geopot  ( ip1jmp1, teta  , pk , pks,  phis  , phi   )
-c$OMP BARRIER
+      CALL geopot_p  ( ip1jmp1, teta  , pk , pks,  phis  , phi   )
+
            jD_cur = jD_ref + day_ini - day_ref
      $        + itau/day_step