Changeset 2083 for LMDZ5/trunk/libf/dyn3dpar

Timestamp:

Jul 9, 2014, 4:43:31 PM (10 years ago)

Author:

Ehouarn Millour

Message:

• Minor fix in dyn3dpar/leapfrog_p.F , should call geopot_p and not geopot
• Added a sanity check in iniacademic
• Added flag "resetvarc" to trigger a reset of initial values in sortvarc
• Removed "sortvarc0" since the job can now be done with "resetvarc" and having set flag resertvarc to true.

EM

Location:

LMDZ5/trunk/libf/dyn3dpar

Files:

• conf_gcm.F (modified) (1 diff)
• iniacademic.F90 (modified) (4 diffs)
• leapfrog_p.F (modified) (1 diff)

LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F

@@ -176 +176 @@
       raz_date = 0
       CALL getin('raz_date', raz_date)
+
+!Config  Key  = resetvarc
+!Config  Desc = Reinit des variables de controle
+!Config  Def  = n
+!Config  Help = Reinit des variables de controle
+      resetvarc = .false.
+      CALL getin('resetvarc',resetvarc)
 
 !Config  Key  = nday

LMDZ5/trunk/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.(read_start==.false.)) 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/trunk/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