Changeset 1749 for LMDZ5/trunk

Timestamp:

Apr 25, 2013, 4:07:07 PM (12 years ago)

Author:

Ehouarn Millour

Message:

Added handling of Newtonian (and Shallow Water) modes in dyn3dmem:

• adapted calfis_loc.F and gcm.F
• removed unused routines divgrad_p.F and gradiv_p.F
• adapted iniacademic.F90 and sw_case_williamson.F to work in parallel and renamed them iniacademi_loc.F90 and sw_case_williamson_loc.F
• fixed bug in exner_milieu_loc.F (filtreg_p form mod_filtreg_p should be used)

EM

Location:

LMDZ5/trunk/libf/dyn3dmem

Files:

• calfis_loc.F (modified) (5 diffs)
• divgrad_p.F (deleted)
• exner_milieu_loc.F (modified) (3 diffs)
• gcm.F (modified) (4 diffs)
• gradiv_p.F (deleted)
• iniacademic.F90 (deleted)
• iniacademic_loc.F90 (added)
• sw_case_williamson91_6.F (deleted)
• sw_case_williamson91_6_loc.F (added)

LMDZ5/trunk/libf/dyn3dmem/calfis_loc.F

@@ -34 +34 @@
       USE dimphy
       USE mod_phys_lmdz_para, mpi_root_xx=>mpi_root 
-      USE parallel, ONLY : omp_chunk, using_mpi,jjb_u,jje_u,jjb_v,jje_v
       USE mod_interface_dyn_phys
       USE IOPHY
 #endif
+      USE parallel, ONLY : omp_chunk, using_mpi,jjb_u,jje_u,jjb_v,jje_v
       USE Write_Field
       Use Write_field_p
@@ -116 +116 @@
 c    -----------
       LOGICAL  lafin
-      REAL heure
-
+!      REAL heure
+      REAL, intent(in):: jD_cur, jH_cur
       REAL pvcov(iip1,jjb_v:jje_v,llm)
       REAL pucov(iip1,jjb_u:jje_u,llm)
@@ -130 +130 @@
       REAL pdteta(iip1,jjb_u:jje_u,llm)
       REAL pdq(iip1,jjb_u:jje_u,llm,nqtot)
+      REAL flxw(iip1,jjb_u:jje_u,llm)  ! Flux de masse verticale sur la grille dynamique
 c
       REAL pps(iip1,jjb_u:jje_u)
@@ -226 +227 @@
       REAL PVteta(klon,ntetaSTD)
       
-      REAL flxw(iip1,jjb_u:jje_u,llm)  ! Flux de masse verticale sur la grille dynamique
       
       REAL SSUM
@@ -234 +234 @@
       SAVE firstcal,debut
 c$OMP THREADPRIVATE(firstcal,debut)
-      REAL, intent(in):: jD_cur, jH_cur
       
       REAL,SAVE,dimension(1:iim,1:llm):: du_send,du_recv,dv_send,dv_recv

LMDZ5/trunk/libf/dyn3dmem/exner_milieu_loc.F

@@ -27 +27 @@
 c
       USE parallel
+      USE mod_filtreg_p
       IMPLICIT NONE
 c
@@ -120 +121 @@
         jjb=jj_begin
         jje=jj_end
-        CALL filtreg_p ( pkf,jjb,jje, jmp1, llm, 2, 1, .TRUE., 1 )
+        CALL filtreg_p ( pkf,jjb_u,jje_u,jjb,jje, jmp1, llm,
+     &                 2, 1, .TRUE., 1 )
 
         ! our work is done, exit routine
@@ -206 +208 @@
       jjb=jj_begin
       jje=jj_end
-      CALL filtreg_p ( pkf,jjb,jje, jmp1, llm, 2, 1, .TRUE., 1 )
+      CALL filtreg_p ( pkf,jjb_u,jje_u,jjb,jje, jmp1, llm,
+     &                 2, 1, .TRUE., 1 )
       
 c    EST-CE UTILE ?? : calcul de beta

LMDZ5/trunk/libf/dyn3dmem/gcm.F

@@ -270 +270 @@
       ! constants & fields, if we run the 'newtonian' or 'SW' cases:
         if (iflag_phys.ne.1) then
-          CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
+          CALL iniacademic_loc(vcov,ucov,teta,q,masse,ps,phis,time_0)
         endif
 
@@ -291 +291 @@
      .              'GCM: AVANT iniacademic AVANT AVANT AVANT AVANT'
       if (.not.read_start) then
-         CALL iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
+         CALL iniacademic_loc(vcov,ucov,teta,q,masse,ps,phis,time_0)
       endif
 
@@ -398 +398 @@
 #endif
 
-
+      if (iflag_phys.eq.1) then
+      ! these initialisations have already been done (via iniacademic)
+      ! if running in SW or Newtonian mode
 c-----------------------------------------------------------------------
 c   Initialisation des constantes dynamiques :
@@ -414 +416 @@
 c   --------------------------
         CALL inifilr
+      endif ! of if (iflag_phys.eq.1)
 c
 c-----------------------------------------------------------------------