Changeset 1403 for trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat

Timestamp:

Mar 31, 2015, 3:49:07 PM (10 years ago)

Author:

emillour

Message:

All models: Reorganizing the physics/dynamics interface.

• makelmdz and makelmdz_fcm scripts adapted to handle the new directory settings

• misc: (replaces what was the "bibio" directory)
• Should only contain extremely generic (and non physics or dynamics-specific) routines
• Therefore moved initdynav.F90, initfluxsto.F, inithist.F, writedynav.F90, write_field.F90, writehist.F to "dyn3d_common"

• dynlonlat_phylonlat: (new interface directory)
• This directory contains routines relevent to physics/dynamics grid interactions, e.g. routines gr_dyn_fi or gr_fi_dyn and calfis
• Moreover the dynlonlat_phylonlat contains directories "phy*" corresponding to each physics package "phy*" to be used. These subdirectories should only contain specific interfaces (e.g. iniphysiq) or main programs (e.g. newstart)

• phy*/dyn1d: this subdirectory contains the 1D model using physics from phy*

EM

Location:

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat

Files:

• . (added)
• calfis.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/calfis.F)
• gr_dyn_fi.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/gr_dyn_fi.F)
• gr_fi_dyn.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/gr_fi_dyn.F)
• mod_grid_phy_lmdz.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/mod_grid_phy_lmdz.F90)
• mod_phys_lmdz_mpi_data.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/mod_phys_lmdz_mpi_data.F90)
• mod_phys_lmdz_mpi_transfert.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/mod_phys_lmdz_mpi_transfert.F90)
• mod_phys_lmdz_omp_data.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/mod_phys_lmdz_omp_data.F90)
• mod_phys_lmdz_omp_transfert.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/mod_phys_lmdz_omp_transfert.F90)
• mod_phys_lmdz_para.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/mod_phys_lmdz_para.F90)
• mod_phys_lmdz_transfert_para.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/mod_phys_lmdz_transfert_para.F90)
• phystd (added)
• phystd/caldyn0.F (added)
• phystd/datareadnc.F (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/datareadnc.F) (4 diffs)
• phystd/defrun_new.F (added)
• phystd/exner_hyb.F (added)
• phystd/grid_noro1.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/grid_noro1.F)
• phystd/ini_archive.F (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/ini_archive.F)
• phystd/iniphysiq.F90 (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/iniphysiq.F90)
• phystd/interp_vert.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/interp_vert.F)
• phystd/lect_start_archive.F (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/lect_start_archive.F)
• phystd/newstart.F (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/newstart.F) (1 diff)
• phystd/scal_wind.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/scal_wind.F)
• phystd/start2archive.F (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/start2archive.F) (1 diff)
• phystd/wind_scal.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/wind_scal.F)
• phystd/write_archive.F (moved) (moved from trunk/LMDZ.GENERIC/libf/phystd/write_archive.F)

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/datareadnc.F

@@ -188 +188 @@
 c    initialisation
 c-----------------------------------------------------------------------
-      call initial0(iimp1*jjp1,pfield)
-      call initial0(imd*jmdp1,zdata)
-      call initial0(imdp1*jmdp1,zdataS)
+      pfield(1:iimp1*jjp1)=0
+      zdata(1:imd*jmdp1)=0
+      zdataS(1:iimp1*jjp1)=0
 
 c-----------------------------------------------------------------------
@@ -208 +208 @@
       if (k.eq.4) then
 
-          call multscal(imd*jmdp1,zdata,1000.,zdata)
-          call multscal(imd,longitude,pi/180.,longitude)
-          call multscal(jmdp1,latitude,pi/180.,latitude)
+          zdata(:)=1000.*zdata(:)
+          longitude(:)=(pi/180.)*longitude(:)
+          latitude(:)=(pi/180.)*latitude(:)
 
           call grid_noro1(360, 180, longitude, latitude, zdata,
@@ -261 +261 @@
       elseif (k.eq.3) then                ! relief
         if (relief.eq.'pla') then
-              call initial0(iimp1*jjp1,phisinit)
+             phisinit(1:iimp1*jjp1)=0
         else
-             do i=1,iimp1*jjp1
-                  phisinit(i) = pfield(i)
-              enddo
+             phisinit(1:iimp1*jjp1)=pfield(1:iimp1*jjp1)
         endif
       endif
@@ -275 +273 @@
 c-----------------------------------------------------------------------
 
-      DO i=1,iimp1*jjp1
-            phisinit(i)=1000.*phisinit(i)
-      ENDDO
+      phisinit(1:iimp1*jjp1)=1000.*phisinit(1:iimp1*jjp1)
       !CALL dump2d(iimp1,jjp1,phisinit,'Altitude en m')
-      CALL multscal(iimp1*jjp1,phisinit,g,phisinit)
+      phisinit(:)=g*phisinit(:)
 
 c-----------------------------------------------------------------------

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/newstart.F

@@ -30 +30 @@
       use comgeomphy, only: initcomgeomphy
       use slab_ice_h, only:noceanmx
+      use filtreg_mod, only: inifilr
       implicit none
 

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/start2archive.F

@@ -29 +29 @@
       USE planete_mod, only: year_day
       USE callkeys_mod, ONLY: ok_slab_ocean
-
+      use filtreg_mod, only: inifilr
       implicit none