Changeset 1403 for trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars

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.MARS/libf/dynlonlat_phylonlat

Files:

• . (added)
• phymars (added)
• phymars/caldyn0.F (added)
• phymars/datareadnc.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/datareadnc.F) (2 diffs)
• phymars/defrun_new.F (added)
• phymars/exner_hyb.F (added)
• phymars/grid_noro1.F (moved) (moved from trunk/LMDZ.MARS/libf/dyn3d/grid_noro1.F)
• phymars/ini_archive.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/ini_archive.F)
• phymars/iniphysiq.F90 (moved) (moved from trunk/LMDZ.MARS/libf/phymars/iniphysiq.F90)
• phymars/interp_vert.F (moved) (moved from trunk/LMDZ.MARS/libf/dyn3d/interp_vert.F)
• phymars/lect_start_archive.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/lect_start_archive.F)
• phymars/newstart.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/newstart.F) (3 diffs)
• phymars/readhead_NC.F (moved) (moved from trunk/LMDZ.MARS/libf/dyn3d/readhead_NC.F)
• phymars/scal_wind.F (moved) (moved from trunk/LMDZ.MARS/libf/dyn3d/scal_wind.F)
• phymars/sponge.h (added)
• phymars/start2archive.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/start2archive.F) (1 diff)
• phymars/wind_scal.F (moved) (moved from trunk/LMDZ.MARS/libf/dyn3d/wind_scal.F)
• phymars/write_archive.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/write_archive.F)
• phymars/xvik.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/xvik.F) (4 diffs)

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/datareadnc.F

@@ -228 +228 @@
       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,
@@ -299 +299 @@
 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 in m')
-      CALL multscal(iimp1*jjp1,phisinit,g,phisinit)
+      phisinit(:)=g*phisinit(:)
 
 c-----------------------------------------------------------------------

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/newstart.F

@@ -34 +34 @@
       use turb_mod, only: q2
       use comgeomfi_h, only: ini_fillgeom
-
+      use filtreg_mod, only: inifilr
 
       implicit none
@@ -137 +137 @@
       integer flagthermo, flagh2o
       character modif*20
-      real z_reel(iip1,jjp1)
       real tsud,albsud,alb_bb,ith_bb,Tiso
       real ptoto,pcap,patm,airetot,ptotn,patmn
@@ -545 +544 @@
         if (trim(modif) .eq. 'flat') then
 c         set topo to zero 
-          CALL initial0(ip1jmp1,z_reel)
-          CALL multscal(ip1jmp1,z_reel,g,phis)
+          phis(:,:)=0
           CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,phis,phisfi)
           write(*,*) 'topography set to zero.'

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/start2archive.F

@@ -24 +24 @@
       use comsoil_h, only: ini_comsoil_h
       use comgeomphy, only: initcomgeomphy
+      use filtreg_mod, only: inifilr
       implicit none
 

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/xvik.F

@@ -1 +1 @@
       PROGRAM xvik
+
+      USE filtreg_mod, ONLY: inifilr
+
       IMPLICIT NONE
 c=======================================================================
@@ -77 +80 @@
 
       EXTERNAL iniconst,inigeom,covcont,mywrite
-      EXTERNAL inifilr,exner,pbar
+      EXTERNAL exner,pbar
       EXTERNAL solarlong,coordij,moy2
       EXTERNAL SSUM
       REAL SSUM
-      EXTERNAL lnblnk
-      INTEGER lnblnk
 
 cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
@@ -157 +158 @@
 
       firstcal=.true.
-      DO WHILE(lnblnk(nomfich).GT.0.AND.lnblnk(nomfich).LT.50)
+      DO WHILE(len_trim(nomfich).GT.0.AND.len_trim(nomfich).LT.50)
       PRINT *,'>>>  nomfich : ',trim(nomfich)
 
 c%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-      file=pathchmp(1:lnblnk(pathchmp))//'/'//
-     s     nomfich(1:lnblnk(nomfich))
-      PRINT*,'file.nc: ', file(1:lnblnk(file))//'.nc'
+      file=pathchmp(1:len_trim(pathchmp))//'/'//
+     s     nomfich(1:len_trim(nomfich))
+      PRINT*,'file.nc: ', file(1:len_trim(file))//'.nc'
       PRINT*,'timestep ',dtvr
 
       IF(nc) THEN
-      ierr= NF_OPEN(file(1:lnblnk(file))//'.nc',NF_NOWRITE,nid)        
+      ierr= NF_OPEN(file(1:len_trim(file))//'.nc',NF_NOWRITE,nid)        
       ELSE
          PRINT*,'Ouverture binaire ',file
@@ -179 +180 @@
 c   ------------------------------
 
-      CALL readhead_NC(file(1:lnblnk(file))//'.nc',day0,phis,constR)
+      CALL readhead_NC(file(1:len_trim(file))//'.nc',day0,phis,constR)
 
       WRITE (*,*) 'day0 = ' , day0