Changeset 988 for trunk/LMDZ.GENERIC/libf

Timestamp:

Jun 12, 2013, 9:53:44 AM (12 years ago)

Author:

emillour

Message:

Generic GCM:

• Moved "newstart" (and related "lect_start_archive.F") to phystd directory
• Adapted makegcm_* scripts to enable compiling main prog from physics
• Added in newstart the possibility to not read in any surface.nc file (when loading a start_archive) with keyword "none" (instead of surface file name)
• Some general cleanup:
  • in bibio: removed unused lmdstd.h readstd.F writestd.F mywrite.F

readcoord.F scatter.F gather.F ini36.F from36.F to36.F
lnblnk.F (F90 len_trim() should be used instead)

• in dyn3d: removed unused inigrads.F wrgrads.F gradsdef.h

xvik.F (specific to current Mars)

EM

Location:

trunk/LMDZ.GENERIC/libf

Files:

• bibio/from36.F (deleted)
• bibio/gather.F (deleted)
• bibio/ini36.F (deleted)
• bibio/lmdstd.h (deleted)
• bibio/lnblnk.F (deleted)
• bibio/mywrite.F (deleted)
• bibio/readcoord.F (deleted)
• bibio/readstd.F (deleted)
• bibio/scatter.F (deleted)
• bibio/to36.F (deleted)
• bibio/writestd.F (deleted)
• dyn3d/gradsdef.h (deleted)
• dyn3d/inigrads.F (deleted)
• dyn3d/wrgrads.F (deleted)
• dyn3d/xvik.F (deleted)
• phystd/datareadnc.F (modified) (5 diffs)
• phystd/lect_start_archive.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/lect_start_archive.F) (1 diff)
• phystd/newstart.F (moved) (moved from trunk/LMDZ.GENERIC/libf/dyn3d/newstart.F) (6 diffs)

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

@@ -1 +1 @@
 c=======================================================================
-      SUBROUTINE datareadnc(relief,phisinit,alb,ith,
+      SUBROUTINE datareadnc(relief,filename,phisinit,alb,ith,
      .                    zmea,zstd,zsig,zgam,zthe)
 c=======================================================================
@@ -63 +63 @@
       parameter    (iimp1=iim+1-1/iim)
 
-      CHARACTER relief*3
-
+      character(len=3),intent(inout) :: relief*3
+      character(len=*),intent(in) :: filename ! surface.nc file
+      real,intent(out) :: phisinit(iimp1*jjp1) ! surface geopotential
+      real,intent(out) :: alb(iimp1*jjp1) ! albedo
+      real,intent(out) :: ith(iimp1*jjp1) ! thermal inertia
+      real,intent(out) :: zmea(imdp1*jmdp1)
+      real,intent(out) :: zstd(imdp1*jmdp1)
+      real,intent(out) :: zsig(imdp1*jmdp1)
+      real,intent(out) :: zgam(imdp1*jmdp1)
+      real,intent(out) :: zthe(imdp1*jmdp1)
+      
       REAL        zdata(imd*jmdp1)
       REAL        zdataS(imdp1*jmdp1)
       REAL        pfield(iimp1*jjp1)
 
-      REAL        alb(iimp1*jjp1)
-      REAL        ith(iimp1*jjp1)
-      REAL        phisinit(iimp1*jjp1)
-
-      REAL        zmea(imdp1*jmdp1)
-      REAL        zstd(imdp1*jmdp1)
-      REAL        zsig(imdp1*jmdp1)
-      REAL        zgam(imdp1*jmdp1)
-      REAL        zthe(imdp1*jmdp1)
-
       INTEGER   ierr
 
@@ -96 +95 @@
       DIMENSION string(4)
 
-      CHARACTER*20 filename
-      CHARACTER*50 filestring
-
-#include "lmdstd.h"
 #include "fxyprim.h"
 
@@ -111 +106 @@
 c    Lecture NetCDF des donnees latitude et longitude
 c-----------------------------------------------------------------------
-!    First get the corret value of dtadir, if not already done:
-      ! default 'datadir' is set in "datadir_mod"
-      call getin("datadir",datadir)
-      write(*,*) 'Choice of surface data is:'
-      filestring='ls '//trim(datadir)//'/*.nc'
-      call system(filestring)
-
-      write(*,*) ''
-      write(*,*) 'Please choose the relevant file:'
-      write(*,*) '(e.g. type "surface_mars.nc")'
-      read(*,fmt='(a20)') filename
-
       ierr = NF_OPEN (trim(datadir)//'/'//trim(adjustl(filename)),
      &  NF_NOWRITE,unit)
@@ -135 +118 @@
         write(*,*)' can be obtained online on:'
         write(*,*)' http://www.lmd.jussieu.fr/~forget/datagcm/datafile'
-        CALL ABORT
+        STOP
       ENDIF
 

trunk/LMDZ.GENERIC/libf/phystd/lect_start_archive.F

@@ -36 +36 @@
 #include "ener.h"
 #include "temps.h"
-#include "lmdstd.h"
 #include "netcdf.inc"
 #include"advtrac.h"

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

@@ -19 +19 @@
       USE surfdat_h
       USE comgeomfi_h
-
+      use datafile_mod, only: datadir
+! to use  'getin'
+      USE ioipsl_getincom, only: getin
       implicit none
 
@@ -34 +36 @@
 #include "ener.h"
 #include "temps.h"
-#include "lmdstd.h"
 #include "comdissnew.h"
 #include "clesph0.h"
@@ -130 +131 @@
       real choix_1,pp
       character*80      fichnom
+      character*250  filestring
       integer Lmodif,iq,thermo
       character modif*20
@@ -146 +148 @@
       INTEGER :: nq,numvanle
       character(len=20) :: txt ! to store some text
+      character(len=50) :: surfacefile ! "surface.nc" (or equivalent file)
+      character(len=150) :: longline
       integer :: count
       real :: profile(llm+1) ! to store an atmospheric profile + surface value
@@ -437 +441 @@
 c=======================================================================
 
-      if (choix_1.ne.1) then  ! pour ne pas avoir besoin du fichier 
-                              ! surface.dat dans le cas des start
+      if (choix_1.eq.0) then  ! for start_archive files, 
+                              ! where an external "surface.nc" file is needed
 
 c do while((relief(1:3).ne.'mol').AND.(relief(1:3).ne.'pla'))
@@ -448 +452 @@
 c     enddo
 
-      CALL datareadnc(relief,phis,alb,surfith,zmeaS,zstdS,zsigS,zgamS,
-     .          ztheS)
-
-      CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,phis,phisfi)
-      CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,surfith,surfithfi)
-      CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,alb,albfi)
-      CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,zmeaS,zmea)
-      CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,zstdS,zstd)
-      CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,zsigS,zsig)
-      CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,zgamS,zgam)
-      CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,ztheS,zthe)
-
-      endif ! of if (choix_1.ne.1)
+!    First get the correct value of datadir, if not already done:
+        ! default 'datadir' is set in "datafile_mod"
+        call getin("datadir",datadir)
+        write(*,*) 'Available surface data files are:'
+        filestring='ls '//trim(datadir)//' | grep .nc'
+        call system(filestring)
+
+        write(*,*) ''
+        write(*,*) 'Please choose the relevant file',
+     &  ' (e.g. "surface_mars.nc")'
+        write(*,*) ' or "none" to not use any (and set planetary'
+        write(*,*) '  albedo and surface thermal inertia)'
+        read(*,fmt='(a50)') surfacefile
+
+        if (surfacefile.ne."none") then
+
+          CALL datareadnc(relief,surfacefile,phis,alb,surfith,
+     &          zmeaS,zstdS,zsigS,zgamS,ztheS)
+        else
+        ! specific case when not using a "surface.nc" file
+          phis(:,:)=0
+          zmeaS(:,:)=0
+          zstdS(:,:)=0
+          zsigS(:,:)=0
+          zgamS(:,:)=0
+          ztheS(:,:)=0
+          
+          write(*,*) "Enter value of albedo of the bare ground:"
+          read(*,*) alb(1,1)
+          alb(:,:)=alb(1,1)
+          
+          write(*,*) "Enter value of thermal inertia of soil:"
+          read(*,*) surfith(1,1)
+          surfith(:,:)=surfith(1,1)
+        
+        endif ! of if (surfacefile.ne."none")
+
+        CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,phis,phisfi)
+        CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,surfith,surfithfi)
+        CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,alb,albfi)
+        CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,zmeaS,zmea)
+        CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,zstdS,zstd)
+        CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,zsigS,zsig)
+        CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,zgamS,zgam)
+        CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,ztheS,zthe)
+
+      endif ! of if (choix_1.eq.0)