Changeset 2354 for LMDZ5

Timestamp:

Aug 28, 2015, 11:38:53 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Corrections for the 1D model to fix initializations broken with previous revision.
EM+MPL

Location:

LMDZ5/trunk/libf

Files:

• dynlonlat_phylonlat/phylmd/iniphysiq_mod.F90 (modified) (2 diffs)
• phylmd/dyn1d/lmdz1d.F90 (modified) (1 diff)

LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/iniphysiq_mod.F90

@@ -109 +109 @@
 
   ! Initialize Physics distibution and parameters and interface with dynamics
-  CALL init_physics_distribution(regular_lonlat,4, &
+  IF (klon_glo>1) THEN ! general 3D case
+    CALL init_physics_distribution(regular_lonlat,4, &
                                  nbp,ii,jj+1,nlayer,communicator)
+  ELSE ! For 1D model
+    CALL init_physics_distribution(regular_lonlat,4, &
+                                 1,1,1,nlayer,communicator)  
+  ENDIF
   CALL init_interface_dyn_phys
   
@@ -254 +259 @@
   CALL init_time(annee_ref,day_ref,day_ini,start_time,nday,ptimestep)
 
-  ! Initialize dimphy module
-  CALL Init_dimphy(klon_omp,nlayer)
+  ! Initialize dimphy module (unless in 1D where it has already been done)
+  IF (klon_glo>1) CALL Init_dimphy(klon_omp,nlayer)
 
   ! Copy over "offline" settings

LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90

@@ -488 +488 @@
 !---------------------------------------------------------------------
 !      call init_phys_lmdz(1,1,llm,1,(/1/)) ! job now done via iniphysiq
+!     but we still need to initialize dimphy module (klon,klev,etc.)  here.
+      call init_dimphy(1,llm)
       call suphel
       call infotrac_init