Changeset 5101 for LMDZ6/branches/Amaury_dev/tools

Timestamp:

Jul 23, 2024, 8:22:55 AM (4 months ago)

Author:

abarral

Message:

Handle DEBUG_IO in lmdz_cppkeys_wrapper.F90
Transform some files .F -> .[fF]90
[ne compile pas à cause de writefield_u non défini - en attente de réponse Laurent]

Location:

LMDZ6/branches/Amaury_dev/tools

Files:

• fcm/lib/Ecmwf/Fortran90_stuff.pm (modified) (5 diffs)
• make_sso/make_sso_SpherePack.f90 (modified) (6 diffs)

LMDZ6/branches/Amaury_dev/tools/fcm/lib/Ecmwf/Fortran90_stuff.pm

@@ -601 +601 @@
     next if(/^ *$/ | /^ *!/);
 # The following two substitutions should be restored at end of processing
-    s/(\'[^!]*)!+(.*\')/$1\£$2/;   # Protect against mischief 
-    s/(["][^!]*)!+(.*["])/$1\£$2/;      # Protect against mischief
+    s/(\'[^!]*)!+(.*\')/$1\�$2/;   # Protect against mischief 
+    s/(["][^!]*)!+(.*["])/$1\�$2/;      # Protect against mischief
     $im=$im+/JPIM\b/i unless($im);
     $rb=$rb+/JPRB\b/i unless($rb);
@@ -629 +629 @@
     next unless (/^\#/);
     if(@pars) {
-      s/^#include +"tsmbkind.h"/USE PARKIND1  ,ONLY : $string/ ;
+      s/^#include +"tsmbkind.h"/USE PARKIND1  ,ONLY: $string/ ;
     }
     else {
@@ -635 +635 @@
     }
 #    if($rh) {
-      s/^#include +"hugekind.h"/USE PARKIND2  ,ONLY : JPRH/ ;
+      s/^#include +"hugekind.h"/USE PARKIND2  ,ONLY: JPRH/ ;
 #    }
 #    else {
@@ -1418 +1418 @@
     if($hook_status == 0) {   # $hook_status == 0 means we have not done anything yet
       if($cont eq 'USE') {    # Add USE YOMHOOK as second use statement
-        $href->{post_insert}="USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK\n";
+        $href->{post_insert}="USE YOMHOOK   ,ONLY: LHOOK,   DR_HOOK\n";
         $hook_status=1;
       }
       elsif($cont eq 'IMPLICIT NONE') { # No previous USE, add USE YOMHOOK before IMPLICIT NONE
-        $href->{pre_insert} ="USE PARKIND1  ,ONLY : JPRB\n".
-          "USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK\n";
+        $href->{pre_insert} ="USE PARKIND1  ,ONLY: JPRB\n".
+          "USE YOMHOOK   ,ONLY: LHOOK,   DR_HOOK\n";
         $hook_status=1;
       } 
@@ -2471 +2471 @@
   s/($name)%$name/$1/g;
   $_=uc($_);
-#  print "PROPAG $called $_ ££ @inpars \n";
+#  print "PROPAG $called $_ �� @inpars \n";
   my @call_args=split ',' , $_;
   my $i=0;

LMDZ6/branches/Amaury_dev/tools/make_sso/make_sso_SpherePack.f90

@@ -136 +136 @@
     msg='Missing or wrong "-m" option ; can be "noro", "spec" or a mask file'
     CALL err(nf90_open(fmsk,nf90_nowrite,fID)/=nf90_noerr,msg)
-    CALL nc(NF90_INQ_VARID(fID,"MaskOcean",vID),"MaskOcean")    !--- MASK ID
-    CALL nc(NF90_INQUIRE_VARIABLE(fID,vID,dimids=dIDs))         !--- DIMS IDS
+    CALL nc(nf90_inq_varid(fID,"MaskOcean",vID),"MaskOcean")    !--- MASK ID
+    CALL nc(nf90_inquire_variable(fID,vID,dimids=dIDs))         !--- DIMS IDS
     CALL nc(nf90_inquire_dimension(fID,dIDs(1),len=nlon_ou),'x')!--- NB LONG
     CALL nc(nf90_inquire_dimension(fID,dIDs(2),len=nlat_ou),'y')!--- NB LAT
@@ -151 +151 @@
 
 !--- GET HEIGHT VARIABLE AND ITS DIMENSIONS 
-  CALL nc(NF90_INQ_VARID(fID,vnam,vID))
-  CALL nc(NF90_INQUIRE_VARIABLE (fID,vID,dimids=dIDs))
+  CALL nc(nf90_inq_varid(fID,vnam,vID))
+  CALL nc(nf90_inquire_variable (fID,vID,dimids=dIDs))
   CALL nc(nf90_inquire_dimension(fID,dIDs(1),len=nlon_in,name=lonn))
   CALL nc(nf90_inquire_dimension(fID,dIDs(2),len=nlat_in,name=latn))
@@ -159 +159 @@
   nlon_in=nlon_in-1                                   !--- DISTINCT POINTS NUMBER
   ALLOCATE(lon_in(nlon_in+1),lat_in(nlat_in),h(nlon_in+1,nlat_in))
-  CALL nc(NF90_INQ_VARID(fID,lonn,loID)        ,lonn)
-  CALL nc(NF90_INQ_VARID(fID,latn,laID)        ,latn)
+  CALL nc(nf90_inq_varid(fID,lonn,loID)        ,lonn)
+  CALL nc(nf90_inq_varid(fID,latn,laID)        ,latn)
   CALL nc(nf90_get_var  (fID,loID,lon_in)      ,lonn)
   CALL nc(nf90_get_var  (fID,laID,lat_in)      ,latn)
@@ -369 +369 @@
       msg='Missing or wrong "-m" option ; can be "noro", "spec" or a mask file'
       CALL err(nf90_open(fmsk,nf90_nowrite,fID)/=nf90_noerr,msg)
-      CALL nc(NF90_INQ_VARID(fID,"MaskOcean",vID),"MaskOcean")    !--- MASK ID
+      CALL nc(nf90_inq_varid(fID,"MaskOcean",vID),"MaskOcean")    !--- MASK ID
       CALL nc(nf90_get_var(fID,vID,msko(:,:)))                    !--- MASK
       CALL nc(nf90_close(fID))
@@ -460 +460 @@
 
   CALL nc(nf90_def_dim(fID,'x',nlon_ou,xID))
-  CALL nc(nf90_def_var(fID,'x',NF90_REAL,xID,loID)      ,'x')
+  CALL nc(nf90_def_var(fID,'x',nf90_real,xID,loID)      ,'x')
   CALL nc(nf90_put_att(fID,loID,'long_name','Longitude'),'x')
   CALL nc(nf90_put_att(fID,loID,'units','degrees_east') ,'x')
 
   CALL nc(nf90_def_dim(fID,'y',nlat_ou,yID))
-  CALL nc(nf90_def_var(fID,'y',NF90_REAL,yID,laID)      ,'y')
+  CALL nc(nf90_def_var(fID,'y',nf90_real,yID,laID)      ,'y')
   CALL nc(nf90_put_att(fID,laID,'long_name','Latitude') ,'y')
   CALL nc(nf90_put_att(fID,laID,'units','degrees_north'),'y')
 
-  CALL nc(nf90_def_var(fID,'mask',NF90_REAL,[xID,yID],mskID),'mask')
+  CALL nc(nf90_def_var(fID,'mask',nf90_real,[xID,yID],mskID),'mask')
   IF(fmsk=='noro') &
-  CALL nc(nf90_def_var(fID,'Zphi',NF90_REAL,[xID,yID],phiID),'Zphi')
-  CALL nc(nf90_def_var(fID,'Zmea',NF90_REAL,[xID,yID],meaID),'Zmea')
-  CALL nc(nf90_def_var(fID,'mu'  ,NF90_REAL,[xID,yID], muID),'mu'  )
-  CALL nc(nf90_def_var(fID,'Zsig',NF90_REAL,[xID,yID],sigID),'Zsig')
-  CALL nc(nf90_def_var(fID,'Zgam',NF90_REAL,[xID,yID],gamID),'Zgam')
-  CALL nc(nf90_def_var(fID,'Zthe',NF90_REAL,[xID,yID],theID),'Zthe')
-  CALL nc(nf90_def_var(fID,'Zpic',NF90_REAL,[xID,yID],picID),'Zpic')
-  CALL nc(nf90_def_var(fID,'Zval',NF90_REAL,[xID,yID],valID),'Zval')
+  CALL nc(nf90_def_var(fID,'Zphi',nf90_real,[xID,yID],phiID),'Zphi')
+  CALL nc(nf90_def_var(fID,'Zmea',nf90_real,[xID,yID],meaID),'Zmea')
+  CALL nc(nf90_def_var(fID,'mu'  ,nf90_real,[xID,yID], muID),'mu'  )
+  CALL nc(nf90_def_var(fID,'Zsig',nf90_real,[xID,yID],sigID),'Zsig')
+  CALL nc(nf90_def_var(fID,'Zgam',nf90_real,[xID,yID],gamID),'Zgam')
+  CALL nc(nf90_def_var(fID,'Zthe',nf90_real,[xID,yID],theID),'Zthe')
+  CALL nc(nf90_def_var(fID,'Zpic',nf90_real,[xID,yID],picID),'Zpic')
+  CALL nc(nf90_def_var(fID,'Zval',nf90_real,[xID,yID],valID),'Zval')
 
   CALL nc(nf90_put_att(fID,mskID,'long_name','Fractional land mask'                      ),'mask')
@@ -834 +834 @@
     IF(fnam/='')     msg=TRIM(msg)//' for file "'//TRIM(fnam)//'"'
     IF(PRESENT(var)) msg=TRIM(msg)//'" and variable "'//TRIM(var)//'"'
-    WRITE(*,*)TRIM(msg)//': '//NF90_STRERROR(ncres); STOP
+    WRITE(*,*)TRIM(msg)//': '//nf90_strerror(ncres); STOP
   END IF